Branch: master

b61f82ab 2014-10-20 14:47:11 François Andriot
RPM Packaging: update tdebase
M redhat/tdebase/tdebase-14.0.0.spec
M redhat/tdelibs/tdelibs-14.0.0.spec
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 300c800..55e1fac 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}/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 f08be12..bbc25d7 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -253,12 +253,12 @@
 %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