From 5828f2101fcba182805855830928c2b8aab0f39a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 8 Jan 2014 16:37:03 +0100 Subject: [PATCH] turn off wsdl generation for now as this requires PyXML that was dropped in f19 --- plcapi.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/plcapi.spec b/plcapi.spec index d8ed5c2..3d63efc 100644 --- a/plcapi.spec +++ b/plcapi.spec @@ -54,7 +54,9 @@ Conflicts: MyPLC <= 4.3 # BuildRequires: postgresql-devel # Standard xmlrpc.so that ships with PHP does not marshal NULL -BuildRequires: php-devel PyXML python-simplejson +# for building the wsdl interface we used to require PyXML +# but this has gone with f20 so turning this off for now +BuildRequires: php-devel python-simplejson Obsoletes: php-xmlrpc Provides: php-xmlrpc @@ -81,7 +83,8 @@ through Apache mod_python. # # Build __init__.py metafiles and PHP API. %{__make} %{?_smp_mflags} -%{__make} -C wsdl +## turning off wsdl generation for now +#%{__make} -C wsdl %install rm -rf $RPM_BUILD_ROOT @@ -108,9 +111,10 @@ 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 +## turning off wsdl generation for now +## 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 @@ -139,7 +143,8 @@ 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 +## turning off wsdl generation for now +#/var/www/html/wsdl/plcapi.wsdl #/usr/bin/omf_slicemgr.py* #/usr/bin/reset_xmpp_pubsub_nodes.py* /var/log/plc_api_ratelimit.log -- 2.43.0