X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plcapi.spec;h=48d8ff7b43d963d1d063e87c58045379b2349ae5;hb=bd46d3f265c3655e432815df9ab7aa6796a3a76b;hp=5d95e0096418c1f0b2cd3fab4f27881f4fb12adf;hpb=3b44c0228c26dc43d985185afc225caa5f48c1fb;p=plcapi.git diff --git a/plcapi.spec b/plcapi.spec index 5d95e00..48d8ff7 100644 --- a/plcapi.spec +++ b/plcapi.spec @@ -27,33 +27,24 @@ Requires: httpd mod_ssl # Requires: Django Requires: postgresql >= 8.2, postgresql-server >= 8.2 # We use set everywhere -Requires: python >= 2.7 -Requires: postgresql-python -Requires: python-psycopg2 -Requires: python-pycurl +Requires: python3 +Requires: python3-postgresql +Requires: python3-psycopg2 +Requires: python3-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 -%endif -#Requires: python-simplejson +Requires: python3-lxml +#Requires: python3-simplejson # for the RebootNodeWithPCU method Requires: pcucontrol >= 1.0-6 -# for OMF integration +# 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: python-ldap +Requires: python3-ldap # for memcache -Requires: memcached python-memcached -### avoid having yum complain about updates, as stuff is moving around -# plc.d/api -Conflicts: MyPLC <= 4.3 +Requires: memcached python3-memcached #################### # obsolete @@ -91,8 +82,8 @@ through Apache mod_python. # python-pycurl and python-psycopg2 avail. from fedora 5 # we used to ship our own version of psycopg2 and pycurl, for fedora4 # starting with 4.3, support for these two modules is taken out -# -# Build __init__.py metafiles and PHP API. +# +# Build __init__.py metafiles and PHP API. %{__make} %{?_smp_mflags} %{__make} -C wsdl @@ -604,18 +595,18 @@ rm -rf $RPM_BUILD_ROOT * Fri May 09 2008 Thierry Parmentelat - PLCAPI-4.2-7 - no more doc packaged outside of myplc-docs - doc/ cleaned up -- enhancements in doc on filters +- enhancements in doc on filters - bootcd-aware GetBootMedium merged from onelab * Thu May 08 2008 Thierry Parmentelat - PLCAPI-4.2-6 - checkpoint while the new myplc-docs package is underway - bugfix: GetSlivers & conf files -- doc: removed target files +- doc: removed target files * Wed Apr 23 2008 Stephen Soltesz - PLCAPI-4.2-5 - Removed conditions on the persons, site, and nodes indexes. previsouly only - the non-deleted fields were index, resulting in massivly slow queries. -- +- * Wed Mar 26 2008 Thierry Parmentelat - PLCAPI-4.2-3 PLCAPI-4.2-4 - plcsh: better handling of options when running as a shell script @@ -623,7 +614,7 @@ rm -rf $RPM_BUILD_ROOT - tweaks for accepted args in GetPCUTypes and BootNotifyOwners * Thu Feb 14 2008 Thierry Parmentelat - PLCAPI-4.2-2 PLCAPI-4.2-3 -- GetBootMedium support for build.sh full options, incl. serial & console_spec +- GetBootMedium support for build.sh full options, incl. serial & console_spec - GetBootMedium simpler, cleaner and safer use of tmpdirs in (dated from bootcustom.sh) * Fri Feb 01 2008 Thierry Parmentelat - PLCAPI-4.2-1 PLCAPI-4.2-2 @@ -634,7 +625,7 @@ rm -rf $RPM_BUILD_ROOT - plcsh adds its own path to sys.path - fix so GetNodes can be called from a Node -* Fri Oct 27 2006 Mark Huang - +* Fri Oct 27 2006 Mark Huang - - Initial build. %define module_current_branch 4.3