summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-10-20 21:47:11 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-10-20 21:47:11 +0200
commitb61f82ab27ca1cf12235cc0366abc5315101402f (patch)
treee64ece725a40b610a1d302d97afdb2431bc70238
parent3083365fef38a8389fae0a6c5fd9a627f2c2f00d (diff)
downloadtde-packaging-b61f82ab27ca1cf12235cc0366abc5315101402f.tar.gz
tde-packaging-b61f82ab27ca1cf12235cc0366abc5315101402f.zip
RPM Packaging: update tdebase
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec4
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec4
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