From b61f82ab27ca1cf12235cc0366abc5315101402f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 20 Oct 2014 21:47:11 +0200 Subject: [PATCH] RPM Packaging: update tdebase --- redhat/tdebase/tdebase-14.0.0.spec | 4 ++-- redhat/tdelibs/tdelibs-14.0.0.spec | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 300c80095..55e1facb6 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -3750,8 +3750,8 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" # Fix permissions on shell scripts -chmod 0755 "%{tde_datadir}/apps/tdeconf_update/move_session_config.sh" -chmod 0755 "%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" +chmod 0755 "%{?buildroot}%{tde_datadir}/apps/tdeconf_update/move_session_config.sh" +chmod 0755 "%{?buildroot}%{tde_tdedocdir}/HTML/en/khelpcenter/glossary/checkxrefs" %clean diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index f08be1206..bbc25d7ed 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -253,12 +253,12 @@ BuildRequires: xz-devel %endif # Certificates support -%if 0%{?rhel} == 6 || 0%{?fedora} == 18 || 0%{?fedora} == 19 +%if 0%{?fedora} == 18 || 0%{?fedora} == 19 %define cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt BuildRequires: ca-certificates Requires: ca-certificates %endif -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 20 +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} >= 20 %define cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt Requires: openssl %endif