From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 30 Jun 2014 17:13:20 +0000 (+0200)
Subject: Remove SELinux module, update changelog.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=e58a7afd527f562d1ebd66bd15f4c607e84a4db4;p=rubygem-passenger-packaging.git

Remove SELinux module, update changelog.
---

diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 40b0b87..051ff20 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -71,9 +71,6 @@ Requires: ruby(release)
 %else
 Requires: ruby(abi) = 1.8
 %endif
-Requires(post): policycoreutils-python
-Requires(preun): policycoreutils-python
-Requires(postun): policycoreutils-python
 
 %if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
 BuildRequires:  libcurl-devel
@@ -92,7 +89,6 @@ BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: httpd-devel
 BuildRequires: libev-devel
-BuildRequires: policycoreutils-python
 BuildRequires: ruby
 BuildRequires: ruby-devel
 BuildRequires: rubygems
@@ -231,9 +227,6 @@ rake package:gem SKIP_SIGNING=1
 rake apache2
 #rake nginx
 
-checkmodule -M -m -o passenger.mod %{SOURCE12}
-semodule_package -o passenger.pp -m passenger.mod
-
 
 %install
 export USE_VENDORED_LIBEV=false
@@ -331,9 +324,6 @@ find %{buildroot}%{gem_instdir} -type f -size 0c -delete
 %{__cp} -p doc/Users?guide?Apache.txt %{buildroot}%{_docdir}/mod_passenger-%{version}
 %endif
 
-%{__mkdir_p} %{buildroot}%{_datadir}/selinux/packages/%{name}
-install -m 0644 passenger.pp %{buildroot}%{_datadir}/selinux/packages/%{name}
-
 
 %check
 export USE_VENDORED_LIBEV=false
@@ -354,24 +344,6 @@ sed -i \
 rake test --trace ||:
 
 
-%post
-if [ "$1" -le "1" ] ; then # First install
-  semodule -i %{_datadir}/selinux/packages/%{name}/passenger.pp 2>/dev/null || :
-fi
-
-
-%preun
-if [ "$1" -lt "1" ] ; then # Final removal
-  semodule -r passenger 2>/dev/null || :
-fi
-
-
-%postun
-if [ "$1" -ge "1" ] ; then # Upgrade
-  semodule -i %{_datadir}/selinux/packages/%{name}/passenger.pp 2>/dev/null || :
-fi
-
-
 %files
 %doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/CHANGELOG
@@ -400,8 +372,6 @@ fi
 %exclude %{gem_instdir}/configure
 %exclude %{gem_instdir}/debian.template/
 %exclude %{gem_cache}
-%dir %{_datadir}/selinux/packages/%{name}
-%{_datadir}/selinux/packages/%{name}/passenger.pp
 
 %files doc
 %doc %{gem_docdir}
@@ -434,6 +404,11 @@ fi
 %{gem_extdir}/lib
 
 %changelog
+* Fri Jun 30 2014 František Dvořák <valtri@civ.zcu.cz> - 4.0.45-4
+- Enable mizuho again (rubygem-mizuho in EPEL 6 now)
+- Sed workaround only due to old asciidoc
+- Remove SELinux modul (moving to passenger application)
+
 * Fri Jun 20 2014 František Dvořák <valtri@civ.zcu.cz> - 4.0.45-1
 - Disable mizuho altogether
 - Add new devel files (*.json and Vagrant)