diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
| commit | e9e7fa543273fffa8131b2244e5c994fe22616e2 (patch) | |
| tree | 6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/tdelibs/tdelibs-14.0.0.spec | |
| parent | 2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff) | |
| download | tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip | |
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/tdelibs/tdelibs-14.0.0.spec')
| -rw-r--r-- | redhat/tdelibs/tdelibs-14.0.0.spec | 18 |
1 files changed, 11 insertions, 7 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" \ |