From 430c48787e46116f09139ae549ffe8e60ba1f89d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 22 Dec 2014 10:26:41 +0100 Subject: RPM packaging: updates --- redhat/main/tdelibs/tdelibs-14.0.0.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'redhat/main/tdelibs') diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec index 8d413d3ed..ce87ab18e 100644 --- a/redhat/main/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec @@ -253,20 +253,25 @@ BuildRequires: xz-devel %endif # Certificates support -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: ca-certificates Requires: ca-certificates -%if 0%{?fedora} == 20 +%if 0%{?fedora} >= 20 || 0%{?rhel} >= 6 %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 +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{pclinuxos} +Requires: rootcerts +%define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt +%else %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt Requires: openssl %endif +%endif %if 0%{?rhel} == 5 %define cacert %{_sysconfdir}/pki/tls/certs/ca-bundle.crt Requires: openssl @@ -341,10 +346,12 @@ BuildRequires: libudev-devel # UDISKS support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6 +%if 0%{?pclinuxos} == 0 %define with_udisks 1 BuildRequires: udisks-devel Requires: udisks %endif +%endif # PMOUNT support #Requires: pmount -- cgit v1.2.3