X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plcapi.spec;h=f26acb12c585b6509e88d2604cf8816331a5b1eb;hb=ae8b10f8363f7a1df02e77cbd820904c4ded10b8;hp=48d8ff7b43d963d1d063e87c58045379b2349ae5;hpb=bd46d3f265c3655e432815df9ab7aa6796a3a76b;p=plcapi.git

diff --git a/plcapi.spec b/plcapi.spec
index 48d8ff7..f26acb1 100644
--- a/plcapi.spec
+++ b/plcapi.spec
@@ -1,6 +1,6 @@
 %define name plcapi
-%define version 5.4
-%define taglevel 1
+%define version 7.0
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -33,16 +33,8 @@ Requires: python3-psycopg2
 Requires: python3-pycurl
 # used in GPG.py as a replacement to PyXML's Canonicalize
 Requires: python3-lxml
-#Requires: python3-simplejson
 # for the RebootNodeWithPCU method
-Requires: pcucontrol >= 1.0-6
-# for OMF integration - xxx aspects needs porting too
-Requires: pyaspects >= 0.4
-# again, these are no longer available in f29
-# Requires: python-twisted-words
-# Requires: python-twisted-web
-# ldap
-Requires: python3-ldap
+#Requires: pcucontrol >= 1.0-6
 # for memcache
 Requires: memcached python3-memcached
 
@@ -85,7 +77,6 @@ through Apache mod_python.
 #
 # Build __init__.py metafiles and PHP API.
 %{__make} %{?_smp_mflags}
-%{__make} -C wsdl
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -106,10 +97,6 @@ mkdir -p ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
 cp db-config.d/* ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d
 chmod 444 ${RPM_BUILD_ROOT}/etc/planetlab/db-config.d/*
 
-# Install wsdl
-echo "* Installing wsdl"
-install -D -m 644 wsdl/plcapi.wsdl $RPM_BUILD_ROOT/var/www/html/wsdl/plcapi.wsdl
-
 ## Thierry - June 2013 - omfv6 does not require xmpp pubsub nodes management any more
 ## Install omf_slicemgr.py
 #install -D -m 755 omf/omf_slicemgr.py $RPM_BUILD_ROOT/usr/bin/omf_slicemgr.py
@@ -139,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %config (noreplace) %{_datadir}/plc_api/PLC/Accessors/Accessors_site.py
 /etc/plc.d
 /etc/planetlab/db-config.d
-/var/www/html/wsdl/plcapi.wsdl
 #/usr/bin/omf_slicemgr.py*
 #/usr/bin/reset_xmpp_pubsub_nodes.py*
 /var/log/plcapi.log
@@ -147,6 +133,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - plcapi-7.0-0
+- based on python3, runs on f27 and f29
+- removed dependency to aspects, and so to rate limits
+- remove dependency to the Django rpm that is no longer available in f29
+- remove deps to python-twisted
+- use systemctl rather than service to manage postgresql
+
 * Wed May 16 2018 Thierry <Parmentelat> - plcapi-5.4-1
 - define accessor for site tag disabled_registration (used in plewww-5.2-9)
 - set disable_existing_loggers = False in logging config, that otherwise voids sfa logs