X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLCAPI.spec;h=ad2ccd35a648a5d717573b416f13256684dd37f7;hb=4492a19a0528f29d64f0c2bc1bb42723fd2df032;hp=cc08b3ff2d69a882d2ac994f7d0f6a935c7ddb13;hpb=052eae1b0aa653903f9df21d264be32f0a97dbf3;p=plcapi.git diff --git a/PLCAPI.spec b/PLCAPI.spec index cc08b3f..ad2ccd3 100644 --- a/PLCAPI.spec +++ b/PLCAPI.spec @@ -5,8 +5,8 @@ %define url $URL$ %define name PLCAPI -%define version 4.2 -%define taglevel 0 +%define version 5.0 +%define taglevel 2 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -37,11 +37,6 @@ BuildRequires: php-devel Obsoletes: php-xmlrpc Provides: php-xmlrpc -# OpenJade does not honor XML catalog files and tries to access -# www.oasis-open.org even if DTDs are locally installed. Disable -# documentation generation for now. -# BuildRequires: docbook-dtds, docbook-utils-pdf - # PostgreSQL and SOAPpy are necessary to run the API server, but not # plcsh. Since the only supported method of running the server is via # MyPLC anyway, don't be so stringent about binary requirements, in @@ -60,32 +55,15 @@ through Apache mod_python. %build # python-pycurl and python-psycopg2 avail. from fedora 5 -# make sure to check build//plc.pkgs -if [ "%{distrorelease}" -le 4 ] ; then - modules="psycopg2 pycurl" -else - modules="" -fi +# we used to ship our own version of psycopg2 and pycurl, for fedora4 +# starting with 5.0, support for these two modules is taken out +# # Build __init__.py metafiles and PHP API. -%{__make} %{?_smp_mflags} subdirs="php php/xmlrpc" modules="$modules" -# Build documentation -# beware that making the pdf file somehow overwrites the html -%{__make} -C doc PLCAPI.pdf -rm -f doc/PLCAPI.html -%{__make} -C doc PLCAPI.html +%{__make} %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -if [ "%{distrorelease}" -le 4 ] ; then - modules="psycopg2 pycurl" -else - modules="" -fi -%{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT" datadir="%{_datadir}" bindir="%{_bindir}" modules="$modules" -#someone out there skips doc installation - we DO want this installed -for doc in PLCAPI.html PLCAPI.pdf ; do - install -D -m 644 doc/$doc $RPM_BUILD_ROOT/"%{_datadir}"/plc_api/doc/$doc -done +%{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT" datadir="%{_datadir}" bindir="%{_bindir}" # Install shell symlink mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -104,15 +82,59 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -#someone out there skips doc installation - we DO want this installed -#%doc doc/PLCAPI.xml doc/PLCAPI.pdf doc/PLCAPI.html %dir %{_datadir}/plc_api %{_datadir}/plc_api/* %{_bindir}/plcsh %{php_extension_dir}/xmlrpc.so %{_sysconfdir}/php.d/xmlrpc.ini -%{_bindir}/refresh-peer.py* +%config (noreplace) %{_datadir}/plc_api/PLC/Accessors/Accessors_site.py %changelog +* Thu Nov 27 2008 Thierry Parmentelat - PLCAPI-5.0-2 +- Checkpointing : this version still has interface settings and slice attributes + +* Wed Sep 10 2008 Thierry Parmentelat - PLCAPI-5.0-1 +- first iteration with taggable nodes/interfaces/slices +- embryo for ilinks +- cleaned up boot states +- migration script moslty complete + +* Wed May 14 2008 Thierry Parmentelat - PLCAPI-4.2-8 +- fixed doc build by locating locally installed DTDs at build-time + +* 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 +- 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 + +* 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 +- getbootmedium exports compute_key +- 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 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 +- refresh peer script to use a month-dependent logfile +- tracking the starting point for UniPi integration of the dummynet boxes + +* Thu Jan 31 2008 Thierry Parmentelat - PLCAPI-4.2-0 PLCAPI-4.2-1 +- plcsh adds its own path to sys.path +- fix so GetNodes can be called from a Node + * Fri Oct 27 2006 Mark Huang - - Initial build. + +%define module_current_branch 4.2