summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-11-13 14:59:08 +0100
committerRemi Collet <fedora@famillecollet.com>2015-11-13 14:59:08 +0100
commit5f37dba04697a4c7230d442b4e36dd9d4c0a02d7 (patch)
treeb110e9aa4588154e96a3871db74c2ff31ec165c1
parent7bf67498ce180e9aa96d30e2f1b550a58476c0c7 (diff)
php54: fix selinux context
-rw-r--r--php54.spec18
1 files changed, 15 insertions, 3 deletions
diff --git a/php54.spec b/php54.spec
index 3e40725..1a0b7c3 100644
--- a/php54.spec
+++ b/php54.spec
@@ -16,7 +16,7 @@
Summary: Package that installs PHP 5.4
Name: %scl_name
Version: 2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Development/Languages
License: GPLv2+
@@ -33,9 +33,9 @@ BuildRequires: iso-codes
BuildRequires: environment-modules
%endif
-Requires: %{?scl_prefix}php-common%{?_isa} >= 5.4.39
+Requires: %{?scl_prefix}php-common%{?_isa} >= 5.4.45
Requires: %{?scl_prefix}php-cli%{?_isa}
-Requires: %{?scl_prefix}php-pear >= 1:1.9.5-9
+Requires: %{?scl_prefix}php-pear >= 1:1.10
Requires: %{?scl_name}-runtime%{?_isa} = %{version}-%{release}
%description
@@ -47,6 +47,8 @@ that install PHP 5.4 language.
Summary: Package that handles %scl Software Collection.
Group: Development/Languages
Requires: scl-utils
+Requires(post): %{_root_sbindir}/semanage
+Requires(post): %{_root_sbindir}/selinuxenabled
Provides: %{?scl_name}-runtime(%{scl_vendor})
Provides: %{?scl_name}-runtime(%{scl_vendor})%{?_isa}
@@ -151,6 +153,13 @@ if [ "%{_root_sysconfdir}/rpm" != "%{macrosdir}" ]; then
fi
+%post runtime
+# Simple copy of context from system root to SCL root.
+semanage fcontext -a -e / %{?_scl_root} &>/dev/null || :
+selinuxenabled && load_policy || :
+restorecon -R %{?_scl_root} &>/dev/null || :
+
+
%{!?_licensedir:%global license %%doc}
%files
@@ -181,6 +190,9 @@ fi
%changelog
+* Fri Nov 13 2015 Remi Collet <remi@fedoraproject.org> 2.1-2
+- fix selinux context
+
* Wed Mar 25 2015 Remi Collet <remi@fedoraproject.org> 2.1-1
- fix licenses location
- own directories for pecl packages