diff options
Diffstat (limited to 'redhat/applications/tdeio')
7 files changed, 55 insertions, 7 deletions
diff --git a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec index efd67d578..aa49a5634 100644 --- a/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec +++ b/redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # 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} @@ -110,7 +118,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/tdeio/tdeio-apt/tdeio-apt.spec b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec index 8e4eccf66..f4631631e 100644 --- a/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec +++ b/redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec @@ -66,7 +66,11 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -108,7 +112,7 @@ browsing the packages easier. It provides: 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 diff --git a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec index ee6f45d34..8dc6b9097 100644 --- a/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec +++ b/redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec @@ -67,13 +67,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # 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} @@ -111,7 +119,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/tdeio/tdeio-gopher/tdeio-gopher.spec b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec index ab01fbfb8..18dab2b6b 100644 --- a/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec +++ b/redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec @@ -67,7 +67,11 @@ BuildRequires: pkgconfig BuildRequires: fdupes # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -107,7 +111,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/tdeio/tdeio-locate/tdeio-locate.spec b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec index cf09c37a2..c58492e13 100644 --- a/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec +++ b/redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec @@ -77,7 +77,11 @@ BuildRequires: brp-check-trinity %endif # ACL support +%if 0%{?mdkver} +BuildRequires: %{_lib}acl-devel +%else BuildRequires: libacl-devel +%endif # IDN support BuildRequires: libidn-devel @@ -90,7 +94,11 @@ BuildRequires: gamin-devel %endif # OPENSSL support +%if 0%{?mdkver} +BuildRequires: %{_lib}openssl-devel +%else BuildRequires: openssl-devel +%endif Obsoletes: trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release} @@ -123,7 +131,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/tdeio/tdeio-sword/tdeio-sword.spec b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec index 8ce52bb71..5881bdfbe 100644 --- a/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec +++ b/redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec @@ -72,13 +72,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # 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} @@ -121,7 +129,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/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec index dd5e8625a..73a3a7b33 100644 --- a/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec +++ b/redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec @@ -71,13 +71,21 @@ BuildRequires: pkgconfig BuildRequires: fdupes # 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} @@ -113,7 +121,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 |