Create database upgrade framework

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

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index a8d3707..7da2ea0 100644 (file)
--- a/contrib/fedora/ipsilon.spec
+++ b/contrib/fedora/ipsilon.spec
@@ -1,8 +1,8 @@
 # Bundling request for bootstrap/patternfly: https://fedorahosted.org/fpc/ticket/483
 
 Name:       ipsilon
-Version:    0.5.0
-Release:    1%{?builddate}%{?gittag}%{?dist}
+Version:    1.0.0
+Release:    2%{?builddate}%{?gittag}%{?dist}
 Summary:    An Identity Provider Server
 
 Group:      System Environment/Base
@@ -68,6 +68,7 @@ License:        GPLv3+
 Requires:       %{name}-filesystem = %{version}-%{release}
 Requires:       %{name}-saml2-base = %{version}-%{release}
 Requires:       mod_auth_mellon
+Requires:       mod_ssl
 BuildArch:      noarch
 
 %description client
@@ -78,7 +79,7 @@ Client install tools
 summary:        IPA helpers
 Group:          System Environment/Base
 License:        GPLv3+
-Requires:       %{name}-authkrb = %{version}-%{release}
+Requires:       %{name}-authgssapi = %{version}-%{release}
 Requires:       %{name}-authform = %{version}-%{release}
 %if 0%{?rhel}
 Requires:       ipa-client
@@ -182,21 +183,21 @@ BuildArch:      noarch
 Provides a login plugin to authenticate against the local PAM stack
 
 
-%package authkrb
-Summary:        mod_auth_kerb based login plugin
+%package authgssapi
+Summary:        mod_auth_gssapi based login plugin
 Group:          System Environment/Base
 License:        GPLv3+
 Requires:       %{name} = %{version}-%{release}
-Requires:       mod_auth_kerb
+Requires:       mod_auth_gssapi
 BuildArch:      noarch
 
-%description authkrb
-Provides a login plugin to allow authentication via the mod_auth_kerb Apache
-module.
+%description authgssapi
+Provides a login plugin to allow authentication via the mod_auth_gssapi
+Apache module.
 
 
 %package authldap
-Summary:        mod_auth_kerb based login plugin
+Summary:        LDAP info and login plugin
 Group:          System Environment/Base
 License:        GPLv3+
 Requires:       %{name} = %{version}-%{release}
@@ -231,12 +232,14 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_defaultdocdir}
 # These 0700 permissions are because ipsilon will store private keys here
 install -d -m 0700 %{buildroot}%{_sharedstatedir}/ipsilon
 install -d -m 0700 %{buildroot}%{_sysconfdir}/ipsilon
-mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_sbindir}
+mv %{buildroot}/%{_bindir}/ipsilon %{buildroot}/%{_libexecdir}
 mv %{buildroot}/%{_bindir}/ipsilon-server-install %{buildroot}/%{_sbindir}
+mv %{buildroot}/%{_bindir}/ipsilon-upgrade-database %{buildroot}/%{_sbindir}
 mv %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
 rm -fr %{buildroot}%{python2_sitelib}/tests
 ln -s %{_datadir}/fonts %{buildroot}%{_datadir}/ipsilon/ui/fonts
@@ -281,6 +284,7 @@ fi
 
 %files
 %{_sbindir}/ipsilon-server-install
+%{_sbindir}/ipsilon-upgrade-database
 %{_datadir}/ipsilon/templates/install/*.conf
 %{_datadir}/ipsilon/ui/saml2sp
 %dir %{python2_sitelib}/ipsilon/helpers
@@ -291,6 +295,7 @@ fi
 %{_defaultdocdir}/%{name}-%{version}
 %{python2_sitelib}/ipsilon/admin
 %{python2_sitelib}/ipsilon/rest
+%{python2_sitelib}/ipsilon/tools/dbupgrade.py*
 %dir %{python2_sitelib}/ipsilon/login
 %{python2_sitelib}/ipsilon/login/__init__*
 %{python2_sitelib}/ipsilon/login/common*
@@ -315,9 +320,9 @@ fi
 %{_datadir}/ipsilon/ui/img
 %{_datadir}/ipsilon/ui/js
 %{_datadir}/ipsilon/ui/fonts
-%{_sbindir}/ipsilon
-%dir %attr(0700,ipsilon,ipsilon) %{_sharedstatedir}/ipsilon
-%dir %attr(0700,ipsilon,ipsilon) %{_sysconfdir}/ipsilon
+%{_libexecdir}/ipsilon
+%dir %attr(0751,root,root) %{_sharedstatedir}/ipsilon
+%dir %attr(0751,root,root) %{_sysconfdir}/ipsilon
 
 %files client
 %{_bindir}/ipsilon-client-install
@@ -351,9 +356,9 @@ fi
 %files authpam
 %{python2_sitelib}/ipsilon/login/authpam*
 
-%files authkrb
-%{python2_sitelib}/ipsilon/login/authkrb*
-%{_datadir}/ipsilon/templates/login/krb.html
+%files authgssapi
+%{python2_sitelib}/ipsilon/login/authgssapi*
+%{_datadir}/ipsilon/templates/login/gssapi.html
 
 %files authldap
 %{python2_sitelib}/ipsilon/login/authldap*
@@ -363,6 +368,15 @@ fi
 %{python2_sitelib}/ipsilon/info/infosssd.*
 
 %changelog
+* Mon Jun 22 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.0.0-2
+- Added mod_ssl requirement for ipsilon-client
+
+* Mon May 11 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.0.0-1
+- Release 1.0.0
+
+* Wed Apr 15 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.6.0-1
+- Release 0.6.0
+
 * Mon Mar 30 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 0.5.0-1
 - Released 0.5.0