git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge master again (2.0-10 changelog only)
[sfa.git]
/
sfa.spec
diff --git
a/sfa.spec
b/sfa.spec
index
52e55dc
..
963abef
100644
(file)
--- a/
sfa.spec
+++ b/
sfa.spec
@@
-1,6
+1,6
@@
%define name sfa
%define name sfa
-%define version 2.
0
-%define taglevel
1
0
+%define version 2.
1
+%define taglevel 0
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@
-24,7
+24,10
@@
URL: %{SCMURL}
Summary: the SFA python libraries
Group: Applications/System
BuildRequires: make
Summary: the SFA python libraries
Group: Applications/System
BuildRequires: make
+
+Requires: myplc-config
Requires: python >= 2.5
Requires: python >= 2.5
+Requires: pyOpenSSL >= 0.7
Requires: m2crypto
Requires: xmlsec1-openssl-devel
Requires: libxslt-python
Requires: m2crypto
Requires: xmlsec1-openssl-devel
Requires: libxslt-python
@@
-40,8
+43,10
@@
Requires: python-dateutil
Requires: postgresql >= 8.2, postgresql-server >= 8.2
Requires: postgresql-python
Requires: python-psycopg2
Requires: postgresql >= 8.2, postgresql-server >= 8.2
Requires: postgresql-python
Requires: python-psycopg2
-Requires: pyOpenSSL >= 0.7
-Requires: myplc-config
+# f8=0.4 - f12=0.5 f14=0.6 f16=0.7
+Requires: python-sqlalchemy
+Requires: python-migrate
+# the eucalyptus aggregate uses this module
Requires: python-xmlbuilder
# python 2.5 has uuid module added, for python 2.4 we still need it.
Requires: python-xmlbuilder
# python 2.5 has uuid module added, for python 2.4 we still need it.
@@
-148,7
+153,7
@@
rm -rf $RPM_BUILD_ROOT
%config /etc/sfa/default_config.xml
%config (noreplace) /etc/sfa/aggregates.xml
%config (noreplace) /etc/sfa/registries.xml
%config /etc/sfa/default_config.xml
%config (noreplace) /etc/sfa/aggregates.xml
%config (noreplace) /etc/sfa/registries.xml
-/usr/share/sfa/
sfa.sql
+/usr/share/sfa/
migrations
/usr/share/sfa/examples
/var/www/html/wsdl/*.wsdl
/usr/share/sfa/examples
/var/www/html/wsdl/*.wsdl
@@
-197,18
+202,18
@@
rm -rf $RPM_BUILD_ROOT
%files tests
%{_datadir}/sfa/tests
%files tests
%{_datadir}/sfa/tests
-### sfa
-plc
installs the 'sfa' service
-%post
plc
+### sfa installs the 'sfa' service
+%post
chkconfig --add sfa
chkconfig --add sfa
-%preun
plc
+%preun
if [ "$1" = 0 ] ; then
/sbin/service sfa stop || :
/sbin/chkconfig --del sfa || :
fi
if [ "$1" = 0 ] ; then
/sbin/service sfa stop || :
/sbin/chkconfig --del sfa || :
fi
-%postun
plc
-[ "$1" -ge "1" ] &&
service sfa restart
+%postun
+[ "$1" -ge "1" ] &&
{ service sfa dbdump ; service sfa restart ; }
### sfa-cm installs the 'sfa-cm' service
%post cm
### sfa-cm installs the 'sfa-cm' service
%post cm