git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fd5f37
)
remove simplejson dependency
author
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 25 Aug 2016 12:22:14 +0000
(14:22 +0200)
committer
Thierry Parmentelat
<thierry.parmentelat@inria.fr>
Thu, 25 Aug 2016 12:22:14 +0000
(14:22 +0200)
plcapi.spec
patch
|
blob
|
history
diff --git
a/plcapi.spec
b/plcapi.spec
index
47b84cb
..
0cae1a4
100644
(file)
--- a/
plcapi.spec
+++ b/
plcapi.spec
@@
-38,7
+38,7
@@
Requires: python-lxml
%if ("%{distro}" == "Fedora" && %{distrorelease} <= 20) || ("%{distro}" != "Fedora")
Requires: SOAPpy
%endif
%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
# 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
# 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
Obsoletes: php-xmlrpc
Provides: php-xmlrpc