diff options
Diffstat (limited to 'redhat/tdelibs')
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 18 | ||||
| -rw-r--r-- | redhat/tdelibs/tdelibs-3.5.13.2.spec | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index edf0782bf..b53fcdd69 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -260,12 +260,16 @@ BuildRequires: NetworkManager-devel %endif # Certificates support -%if 0%{?rhel} || 0%{?fedora} -%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt +%if 0%{?rhel} >= 6 || 0%{?fedora} +%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt Requires: ca-certificates %endif %if 0%{?mgaversion} || 0%{?mdkversion} -%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt +%define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt +Requires: openssl +%endif +%if 0%{?rhel} == 5 +%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt Requires: openssl %endif @@ -447,10 +451,10 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec index a2a9a3a79..016acd3e3 100644 --- a/redhat/tdelibs/tdelibs-3.5.13.2.spec +++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec @@ -396,11 +396,10 @@ if [ -d "/usr/X11R6" ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include" fi - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi %cmake \ -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ |