summaryrefslogtreecommitdiffstats
path: root/redhat/main
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2015-04-20 21:24:26 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2015-04-20 21:24:26 +0200
commit07d8f15f3a8cf671ea485cecd1da5d51d23be84e (patch)
tree09ba0a4d9a48c5378693b796ab0f4424b5249902 /redhat/main
parent985dc0e053e528b7c9ecb44a5e4ed5b781eeb72a (diff)
downloadtde-packaging-07d8f15f3a8cf671ea485cecd1da5d51d23be84e.tar.gz
tde-packaging-07d8f15f3a8cf671ea485cecd1da5d51d23be84e.zip
RPM packaging: update koffice, tdebase, tdegraphics
Diffstat (limited to 'redhat/main')
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec8
-rw-r--r--redhat/main/tdegraphics/tdegraphics-14.0.0.spec2
2 files changed, 4 insertions, 6 deletions
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index b0e44ad5e..46ab3ce31 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -2188,9 +2188,6 @@ already. Most users won't need this.
%{tdm_datadir}/themes/
%{tde_datadir}/config/%{tdm}
%dir %{_sysconfdir}/trinity/%{tdm}
-%if 0%{?with_selinux_policy}
-%exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
-%endif
%config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
%{tde_tdedocdir}/HTML/en/%{tdm}/
%if 0%{?suse_version} == 0
@@ -2262,12 +2259,13 @@ fi
%if 0%{?mgaversion} || 0%{?mdkversion}
%make_session
%endif
+
+# SELINUX context for tdm
%if 0%{?with_selinux_policy}
/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
%endif
-# SELINUX context for tdm
-%if 0%{?fedora} == 21
+%if 0%{?fedora} == 21 || 0%{?rhel} >= 7
if ! grep -q "%{tde_bindir}/tdm" "/etc/selinux/targeted/contexts/files/file_contexts.local" ; then
echo "%{tde_bindir}/tdm -- system_u:object_r:xdm_exec_t" >>"/etc/selinux/targeted/contexts/files/file_contexts.local"
restorecon "%{tde_bindir}/tdm"
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 569774e8d..f22cec9c0 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -193,7 +193,7 @@ BuildRequires: libdrm-devel
# OPENEXR support
BuildRequires: OpenEXR-devel
-# poppler
+# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
BuildRequires: poppler-devel >= 0.12
#BuildRequires: poppler-qt-devel >= 0.12