remove simplejson dependency

[plcapi.git] / plcapi.spec

diff --git a/plcapi.spec b/plcapi.spec
index 2c6c146..0cae1a4 100644 (file)
--- a/plcapi.spec
+++ b/plcapi.spec
@@ -1,6 +1,6 @@
 %define name plcapi
 %define version 5.3
-%define taglevel 5
+%define taglevel 10
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -32,8 +32,13 @@ Requires: python-psycopg2
 Requires: python-pycurl
 # used in GPG.py as a replacement to PyXML's Canonicalize
 Requires: python-lxml
+# Fedora had support for SOAPpy up to fedora20
+# https://lists.fedoraproject.org/pipermail/devel/2014-June/199730.html
+# https://lists.fedoraproject.org/pipermail/devel/2014-June/200379.html
+%if ("%{distro}" == "Fedora" && %{distrorelease} <= 20) || ("%{distro}" != "Fedora")
 Requires: SOAPpy
-Requires: python-simplejson
+%endif
+#Requires: python-simplejson
 # for the RebootNodeWithPCU method
 Requires: pcucontrol >= 1.0-6
 # for OMF integration
@@ -56,7 +61,8 @@ Conflicts: MyPLC <= 4.3
 # Standard xmlrpc.so that ships with PHP does not marshal NULL
 # 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
+BuildRequires: php-devel
+#BuildRequires: python-simplejson
 Obsoletes: php-xmlrpc
 Provides: php-xmlrpc
 
@@ -148,6 +154,24 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-10
+- GetBootMedium with systemd-debug option : add kernel arg systemd.log_target=console
+
+* Fri Jun 26 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-9
+- new bootstate 'upgrade' is like reinstall but leaves slices intact
+
+* Fri Apr 24 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-8
+- GetBootMedium now keeps logs of created bootCD's in /var/tmp/bootmedium
+
+* Fri Apr 03 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-7
+- reviewed logging strategy, no more direct print but use log instead
+
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-6
+- extensions for the ipv6 feature
+- DeleteSliceTag can be run with the 'node' auth
+- xmlrpc-epi-php.c has has a tweak for f21/php-5.6
+- also SOAPpy is not present in f21 anymore, so drop that dep. with f>=21
+
 * Tue Aug 19 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - plcapi-5.3-5
 - allow GetSlices to filter on tags as well