Bump spec file

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

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index 3e0343b..465b68a 100644 (file)
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -2,7 +2,7 @@
 
 Name:       ipsilon
 Version:    0.3.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    An Identity Provider Server
 
 Group:      System Environment/Base
@@ -19,10 +19,8 @@ BuildRequires:  python-openid, python-openid-cla, python-openid-teams
 BuildRequires:  m2crypto
 Requires:       httpd
 Requires:       mod_ssl
-Requires:       ipsilon-tools = %{version}-%{release}
 Requires:       ipsilon-provider = %{version}-%{release}
 Requires:       mod_wsgi
-Requires:       mod_intercept_form_submit
 Requires:       python-cherrypy
 Requires:       python-jinja2
 Requires:       python-lxml
@@ -49,7 +47,7 @@ Requires:       mod_auth_mellon
 BuildArch:      noarch
 
 %description tools
-Convenience client install tools for the Ipsilon identity Provider
+Convenience install tools for the Ipsilon identity Provider
 
 
 %package tools-ipa
@@ -123,6 +121,18 @@ BuildArch:      noarch
 Provides a login plugin to authenticate against the Fedora Authentication System
 
 
+%package authform
+Summary:        mod_intercept_form_submit login plugin
+Group:          System Environment/Base
+License:        GPLv3+
+Requires:       %{name} = %{version}-%{release}
+Requires:       mod_intercept_form_submit
+BuildArch:      noarch
+
+%description authform
+Provides a login plugin to authenticate with mod_intercept_form_submit
+
+
 %package authpam
 Summary:        PAM based login plugin
 Group:          System Environment/Base
@@ -166,7 +176,7 @@ License:        GPLv3+
 Requires:       %{name} = %{version}-%{release}
 Requires:       mod_lookup_identity
 Requires:       libsss_simpleifp
-Requires;       sssd >= 1.12.4
+Requires:       sssd >= 1.12.4
 BuildArch:      noarch
 
 %description infosssd
@@ -228,7 +238,6 @@ fi
 %dir %{python2_sitelib}/ipsilon/login
 %{python2_sitelib}/ipsilon/login/__init__*
 %{python2_sitelib}/ipsilon/login/common*
-%{python2_sitelib}/ipsilon/login/authform*
 %{python2_sitelib}/ipsilon/login/authtest*
 %dir %{python2_sitelib}/ipsilon/info
 %{python2_sitelib}/ipsilon/info/__init__*
@@ -247,15 +256,12 @@ fi
 %dir %{_datadir}/ipsilon/templates/login
 %{_datadir}/ipsilon/templates/login/index.html
 %{_datadir}/ipsilon/templates/login/form.html
-%dir %{_datadir}/ipsilon/templates/install
-%{_datadir}/ipsilon/templates/install/*.conf
 %dir %{_datadir}/ipsilon/ui
 %{_datadir}/ipsilon/ui/css
 %{_datadir}/ipsilon/ui/img
 %{_datadir}/ipsilon/ui/js
 %{_datadir}/ipsilon/ui/fonts
 %{_sbindir}/ipsilon
-%{_sbindir}/ipsilon-server-install
 %dir %attr(0700,ipsilon,ipsilon) %{_sharedstatedir}/ipsilon
 %dir %attr(0700,ipsilon,ipsilon) %{_sysconfdir}/ipsilon
 
@@ -270,6 +276,9 @@ fi
 %{_datadir}/ipsilon/templates/install/saml2
 %{_datadir}/ipsilon/ui/saml2sp
 %{_bindir}/ipsilon-client-install
+%{_sbindir}/ipsilon-server-install
+%dir %{_datadir}/ipsilon/templates/install
+%{_datadir}/ipsilon/templates/install/*.conf
 
 %files tools-ipa
 %{python2_sitelib}/ipsilon/helpers/ipa.py*
@@ -289,6 +298,9 @@ fi
 %files authfas
 %{python2_sitelib}/ipsilon/login/authfas*
 
+%files authform
+%{python2_sitelib}/ipsilon/login/authform*
+
 %files authpam
 %{python2_sitelib}/ipsilon/login/authpam*
 
@@ -304,6 +316,10 @@ fi
 %{python2_sitelib}/ipsilon/info/infosssd.*
 
 %changelog
+* Tue Feb 24 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.3.0-7
+- Split the installer into -tools
+- Split authform into -authform
+
 * Thu Feb 12 2015 Rob Crittenden <rcritten@redhat.com> - 0.3.0-6
 - Add mod_identity_lookup info plugin package