%define name sfa
%define version 4.0
-%define taglevel 1
+%define taglevel 2
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global python_sitearch %( python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
+%{!?python_sitelib: %define python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: %{name}
Version: %{version}
Summary: Server-side for SFA, generic implementation derived from PlanetLab
Group: Applications/System
BuildRequires: make
-BuildRequires: python-setuptools
+BuildRequires: python2-dateutil
+BuildRequires: python2-lxml
+# for uuidgen - used in db password generation
+Requires: util-linux-ng
# for the registry
Requires: postgresql >= 8.2, postgresql-server >= 8.2
Requires: postgresql-python
-Requires: python-psycopg2
-# f8=0.4 - f12=0.5 f14=0.6 f16=0.7
-Requires: python-sqlalchemy
-Requires: python-migrate
-# for uuidgen - used in db password generation
-# on f8 this actually comes with e2fsprogs, go figure
-Requires: util-linux-ng
-# and the SFA libraries of course
+Requires: python2-psycopg2
+Requires: python2-sqlalchemy
+Requires: python2-migrate
+# and of course the bulk of it
Requires: sfa-common
%package common
Summary: Python libraries for SFA, generic implementation derived from PlanetLab
Group: Applications/System
-Requires: python >= 2.7
-Requires: pyOpenSSL >= 0.7
+Requires: python
+Requires: pyOpenSSL
Requires: m2crypto
-Requires: python-dateutil
-Requires: python-lxml
-Requires: libxslt-python
+Requires: python2-dateutil
+Requires: python2-lxml
+%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "27"
Requires: python-ZSI
+%else
+Requires: python2-zsi
+%endif
+Requires: libxslt-python
Requires: xmlsec1-openssl-devel
%package client
%post
systemctl enable sfa-aggregate
systemctl enable sfa-registry
+true
%preun
if [ "$1" = 0 ] ; then
systemctl is-active $service && systemctl stop $service
done
fi
+true
%postun
if [ "$1" -ge "1" ] ; then
systemctl is-active $service && systemctl restart $service
done
fi
+true
%changelog
+* Mon Jan 07 2019 Thierry <Parmentelat> - sfa-4.0-2
+- have shebangs mention python2 since it is what this version runs on
+- use rpm names in python2-something for expressing dependencies
+- remove build dependency to python-setuptools
+- Handle C-BAS hrn format with "\" (Loic)
+- sfa-start does not daemonize anymore (this is handled by systemd)
+- a little nicer logs when troubleshooting auth issues
+- use systemctl in Makefile when syncing
+
* Wed May 30 2018 Thierry <Parmentelat> - sfa-4.0-1
- systemd service files install in /lib instead of /usr/lib for ubuntus
- removed all features relating to slice manager