Update spec file dependencies on lasso and mellon

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

diff --git a/contrib/fedora/ipsilon.spec b/contrib/fedora/ipsilon.spec
index 6553208..8ab4c4e 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:    1.0.0
-Release:    2%{?builddate}%{?gittag}%{?dist}
+Version:    1.1.0
+Release:    1%{?builddate}%{?gittag}%{?dist}
 Summary:    An Identity Provider Server
 
 Group:      System Environment/Base
@@ -14,7 +14,7 @@ BuildArch:  noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-BuildRequires:  lasso-python
+BuildRequires:  lasso-python >= 2.5.0
 BuildRequires:  python-openid, python-openid-cla, python-openid-teams
 BuildRequires:  m2crypto
 
@@ -67,7 +67,7 @@ Group:          System Environment/Base
 License:        GPLv3+
 Requires:       %{name}-filesystem = %{version}-%{release}
 Requires:       %{name}-saml2-base = %{version}-%{release}
-Requires:       mod_auth_mellon
+Requires:       mod_auth_mellon >= 0.11.0
 Requires:       mod_ssl
 BuildArch:      noarch
 
@@ -98,7 +98,7 @@ Convenience client install tools for IPA support in the Ipsilon identity Provide
 Summary:        SAML2 base
 Group:          System Environment/Base
 License:        GPLv3+
-Requires:       lasso-python
+Requires:       lasso-python >= 2.5.0
 Requires:       python-lxml
 BuildArch:      noarch
 
@@ -234,11 +234,13 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_defaultdocdir}
+mkdir -p %{buildroot}%{_localstatedir}/cache/ipsilon
 # 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}/%{_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
@@ -283,6 +285,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
@@ -293,6 +296,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*
@@ -317,9 +321,11 @@ fi
 %{_datadir}/ipsilon/ui/img
 %{_datadir}/ipsilon/ui/js
 %{_datadir}/ipsilon/ui/fonts
+%{_datadir}/ipsilon/ui/fonts-local
 %{_libexecdir}/ipsilon
 %dir %attr(0751,root,root) %{_sharedstatedir}/ipsilon
 %dir %attr(0751,root,root) %{_sysconfdir}/ipsilon
+%dir %attr(0750,ipsilon,apache) %{_localstatedir}/cache/ipsilon
 
 %files client
 %{_bindir}/ipsilon-client-install
@@ -365,6 +371,9 @@ fi
 %{python2_sitelib}/ipsilon/info/infosssd.*
 
 %changelog
+* Sat Sep 05 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.1.0-1
+- Release 1.1.0
+
 * Mon Jun 22 2015 Patrick Uiterwijk <puiterwijk@redhat.com> - 1.0.0-2
 - Added mod_ssl requirement for ipsilon-client