Do not overwrite default plugin options

[cascardo/ipsilon.git] / contrib / fedora / ipsilon.spec

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index b0ebb7f..a891713 100644 (file)
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -1,5 +1,5 @@
 Name:          ipsilon
-Version:       0.2.3
+Version:       0.2.5
 Release:       1%{?dist}
 Summary:       An Identity Provider Server
 
@@ -15,11 +15,15 @@ Requires:       ipsilon-tools = %{version}-%{release}
 Requires:      lasso-python
 Requires:      mod_wsgi
 Requires:      mod_auth_kerb
+Requires:       mod_intercept_form_submit
 Requires:       python-cherrypy
 Requires:       python-jinja2
 Requires:       python-lxml
 Requires:       python-pam
+Requires:       python-sqlalchemy
 Requires(pre):  shadow-utils
+Requires(post): %_sbindir/semanage, %_sbindir/restorecon
+Requires(postun): %_sbindir/semanage
 
 %description
 Ipsilon is a multi-protocol Identiy Provider service. Its function is to
@@ -54,6 +58,9 @@ install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon
 mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_sbindir}
 mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir}
 install -d -m 0700 %{buildroot}%{_sysconfdir}/ipsilon
+mkdir -p %{buildroot}%{_defaultdocdir}
+mv %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+rm -fr %{buildroot}%{python2_sitelib}/tests
 
 %pre
 getent group ipsilon >/dev/null || groupadd -r ipsilon
@@ -63,19 +70,23 @@ getent passwd ipsilon >/dev/null || \
 exit 0
 
 %post
-semanage fcontext -a -t httpd_var_lib_t '%{_sharedstatedir}/ipsilon(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t var_lib_t '%{_sharedstatedir}/ipsilon(/.*)/*.conf' 2>/dev/null || :
+semanage fcontext -a -t httpd_var_lib_t '%{_sharedstatedir}/ipsilon(/.*)?' || :
+semanage fcontext -a -t var_lib_t '%{_sharedstatedir}/ipsilon(/.*)/*.conf' || :
 restorecon -R %{_sharedstatedir}/ipsilon || :
 
 %postun
-semanage fcontext -d -t var_lib_t '%{_sharedstatedir}/ipsilon(/.*)/*.conf' 2>/dev/null || :
-semanage fcontext -d -t httpd_var_lib_t '%{_sharedstatedir}/ipsilon(/.*)?' 2>/dev/null || :
+# Clean up after package removal
+if [ $1 -eq 0 ]; then
+    semanage fcontext -d -t var_lib_t '%{_sharedstatedir}/ipsilon(/.*)/*.conf' || :
+    semanage fcontext -d -t httpd_var_lib_t '%{_sharedstatedir}/ipsilon(/.*)?' || :
+fi
 
 %files
-%doc COPYING
+%{_defaultdocdir}/%{name}-%{version}
 %{python2_sitelib}/ipsilon-*.egg-info
 %{python2_sitelib}/ipsilon/admin/*
 %{python2_sitelib}/ipsilon/login/*
+%{python2_sitelib}/ipsilon/info/*
 %{python2_sitelib}/ipsilon/providers/*
 %{python2_sitelib}/ipsilon/root.py*
 %{python2_sitelib}/ipsilon/util/*
@@ -94,7 +105,7 @@ semanage fcontext -d -t httpd_var_lib_t '%{_sharedstatedir}/ipsilon(/.*)?' 2>/de
 %dir %attr(0700,ipsilon,ipsilon) %{_sysconfdir}/ipsilon
 
 %files tools
-%doc COPYING
+%doc COPYING README
 %{python2_sitelib}/ipsilon-*.egg-info
 %{python2_sitelib}/ipsilon/__init__.py*
 %{python2_sitelib}/ipsilon/tools/*