X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plcapi.spec;h=0cae1a45734fd1d156a2223fb95211286860bda8;hb=c00cb94ae221df67a821efcc1640e88854e63ece;hp=93ad78d1e57e9ed0ddf9428a509d5587bcac03ca;hpb=e17828f46eab51e3a9c07203016db4dac9bfb9e5;p=plcapi.git diff --git a/plcapi.spec b/plcapi.spec index 93ad78d..0cae1a4 100644 --- a/plcapi.spec +++ b/plcapi.spec @@ -1,6 +1,6 @@ %define name plcapi %define version 5.3 -%define taglevel 9 +%define taglevel 10 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -38,7 +38,7 @@ Requires: python-lxml %if ("%{distro}" == "Fedora" && %{distrorelease} <= 20) || ("%{distro}" != "Fedora") Requires: SOAPpy %endif -Requires: python-simplejson +#Requires: python-simplejson # for the RebootNodeWithPCU method Requires: pcucontrol >= 1.0-6 # for OMF integration @@ -61,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 @@ -153,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jul 10 2016 Thierry Parmentelat - plcapi-5.3-10 +- GetBootMedium with systemd-debug option : add kernel arg systemd.log_target=console + * Fri Jun 26 2015 Thierry Parmentelat - plcapi-5.3-9 - new bootstate 'upgrade' is like reinstall but leaves slices intact