diff options
Diffstat (limited to 'redhat/applications/internet')
13 files changed, 85 insertions, 17 deletions
diff --git a/redhat/applications/internet/kasablanca/kasablanca.spec b/redhat/applications/internet/kasablanca/kasablanca.spec index 20d624fb6..7d956ef72 100644 --- a/redhat/applications/internet/kasablanca/kasablanca.spec +++ b/redhat/applications/internet/kasablanca/kasablanca.spec @@ -78,13 +78,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # UTEMPTER support %if 0%{?suse_version} @@ -129,7 +137,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kbiff/kbiff.spec b/redhat/applications/internet/kbiff/kbiff.spec index a147f3cb5..719fe4931 100644 --- a/redhat/applications/internet/kbiff/kbiff.spec +++ b/redhat/applications/internet/kbiff/kbiff.spec @@ -69,13 +69,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -112,7 +120,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec index 70cfe8dc9..3c6ef1d42 100644 --- a/redhat/applications/internet/kftpgrabber/kftpgrabber.spec +++ b/redhat/applications/internet/kftpgrabber/kftpgrabber.spec @@ -76,7 +76,11 @@ BuildRequires: brp-check-trinity %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -129,7 +133,7 @@ Requires: %{name} = %{version}-%{release} unset QTDIR QTINC QTDIR export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/knmap/knmap.spec b/redhat/applications/internet/knmap/knmap.spec index b4a6d3795..14ade96fd 100644 --- a/redhat/applications/internet/knmap/knmap.spec +++ b/redhat/applications/internet/knmap/knmap.spec @@ -68,13 +68,21 @@ BuildRequires: pkgconfig BuildRequires: libtool # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/konversation/konversation.spec b/redhat/applications/internet/konversation/konversation.spec index e9ec6c71e..69f7bc141 100644 --- a/redhat/applications/internet/konversation/konversation.spec +++ b/redhat/applications/internet/konversation/konversation.spec @@ -66,13 +66,21 @@ BuildRequires: gcc-c++ BuildRequires: pkgconfig # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # PYTHON support %global python python3 @@ -93,7 +101,12 @@ BuildRequires: brp-check-trinity %endif # XSLT support +%if 0%{?mdkver} +BuildRequires: %{_lib}xslt-devel +%else BuildRequires: libxslt-devel +%endif + %if 0%{?suse_version} BuildRequires: docbook-xsl-stylesheets %else @@ -199,7 +212,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kopete-otr/kopete-otr.spec b/redhat/applications/internet/kopete-otr/kopete-otr.spec index 47964b743..1bc95975d 100644 --- a/redhat/applications/internet/kopete-otr/kopete-otr.spec +++ b/redhat/applications/internet/kopete-otr/kopete-otr.spec @@ -83,8 +83,11 @@ BuildRequires: brp-check-trinity %endif # OTR support +%if 0%{?mdkver} +BuildRequires: %{_lib}otr-devel +%else BuildRequires: libotr-devel - +%endif %description This plugin enables Off-The-Record encryption for the TDE instant @@ -110,7 +113,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kshowmail/kshowmail.spec b/redhat/applications/internet/kshowmail/kshowmail.spec index 83dc1c039..e1c7d3e1a 100644 --- a/redhat/applications/internet/kshowmail/kshowmail.spec +++ b/redhat/applications/internet/kshowmail/kshowmail.spec @@ -77,13 +77,21 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif %description @@ -108,7 +116,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/kstreamripper/kstreamripper.spec b/redhat/applications/internet/kstreamripper/kstreamripper.spec index bf4e432d6..fa2fbcb33 100644 --- a/redhat/applications/internet/kstreamripper/kstreamripper.spec +++ b/redhat/applications/internet/kstreamripper/kstreamripper.spec @@ -103,7 +103,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/ktorrent/ktorrent.spec b/redhat/applications/internet/ktorrent/ktorrent.spec index 210e7ddf8..d67deae4f 100644 --- a/redhat/applications/internet/ktorrent/ktorrent.spec +++ b/redhat/applications/internet/ktorrent/ktorrent.spec @@ -123,7 +123,7 @@ enabling background downloading. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec index 79894bda6..a4b2b7fcc 100644 --- a/redhat/applications/internet/kvirc/kvirc.spec +++ b/redhat/applications/internet/kvirc/kvirc.spec @@ -143,7 +143,7 @@ with the K Desktop Environment version 3. %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" ./autogen.sh diff --git a/redhat/applications/internet/kvpnc/kvpnc.spec b/redhat/applications/internet/kvpnc/kvpnc.spec index ef911ef88..9983af3e4 100644 --- a/redhat/applications/internet/kvpnc/kvpnc.spec +++ b/redhat/applications/internet/kvpnc/kvpnc.spec @@ -67,13 +67,28 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif + +# GCRYPT support +%if 0%{?mdkver} +BuildRequires: %{_lib}gcrypt-devel >= 1.2.0 +%else +BuildRequires: libgcrypt-devel >= 1.2.0 +%endif # IDN support BuildRequires: libidn-devel # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # SUSE desktop files utility %if 0%{?suse_version} @@ -85,9 +100,6 @@ BuildRequires: update-desktop-files BuildRequires: brp-check-trinity %endif -BuildRequires: libgcrypt-devel >= 1.2.0 - - %description KVpnc is a TDE frontend for various vpn clients. @@ -116,7 +128,7 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec index 26c0ed20f..73799b17c 100644 --- a/redhat/applications/internet/smb4k/smb4k.spec +++ b/redhat/applications/internet/smb4k/smb4k.spec @@ -150,7 +150,7 @@ Requires: %{name} = %{version}-%{release} unset QTDIR QTINC QTLIB export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi diff --git a/redhat/applications/internet/tork/tork.spec b/redhat/applications/internet/tork/tork.spec index 32241b0e0..97c96d3a4 100644 --- a/redhat/applications/internet/tork/tork.spec +++ b/redhat/applications/internet/tork/tork.spec @@ -80,7 +80,11 @@ BuildRequires: brp-check-trinity BuildRequires: torsocks # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif # GEOIP %if 0%{?suse_version} @@ -116,7 +120,7 @@ on the Tor network. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -if ! rpm -E %%cmake|grep -q "cd build"; then +if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then %__mkdir_p build cd build fi |