diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-12-15 23:38:06 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-12-15 23:38:06 +0100 |
| commit | d19d14a03103d32059598d292defb77945309f28 (patch) | |
| tree | ee992c9fa6b2aaf1f12cefcccaec75e2eaa0a550 /redhat/main/tdelibs | |
| parent | 092caa810a152ddcbc89e908fee1f4611a5acc70 (diff) | |
| download | tde-packaging-d19d14a03103d32059598d292defb77945309f28.tar.gz tde-packaging-d19d14a03103d32059598d292defb77945309f28.zip | |
RPM packaging: update for R14
Diffstat (limited to 'redhat/main/tdelibs')
| -rw-r--r-- | redhat/main/tdelibs/tdelibs-14.0.0.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 4071cb33c..8d413d3ed 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -171,13 +171,13 @@ BuildRequires: utempter-devel %endif # HSPELL support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} %define with_hspell 1 BuildRequires: hspell-devel %endif # JASPER support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_jasper 1 %if 0%{?suse_version} BuildRequires: libjasper-devel @@ -205,7 +205,7 @@ Requires: avahi %endif # OPENEXR support -%if 0%{?rhel} >=5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %define with_openexr 1 BuildRequires: OpenEXR-devel %endif @@ -253,12 +253,17 @@ BuildRequires: xz-devel %endif # Certificates support -%if 0%{?fedora} == 18 || 0%{?fedora} == 19 -%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt +%if 0%{?fedora} BuildRequires: ca-certificates Requires: ca-certificates +%if 0%{?fedora} == 20 +%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +%endif +%if 0%{?fedora} == 18 || 0%{?fedora} == 19 +%define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt +%endif %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt Requires: openssl %endif |