X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-docs.spec;h=689b4696ef3a925c1d000e93e5316e92490d2e39;hb=refs%2Fheads%2Fmaster;hp=19aad78b7fb269997402ecad31039d397e4f0b8c;hpb=9484314a715e4729c845e2227610a40967ce54b2;p=myplc.git diff --git a/myplc-docs.spec b/myplc-docs.spec index 19aad78..689b469 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -1,6 +1,6 @@ %define name myplc-docs -%define version 5.0 -%define taglevel 17 +%define version 7.1 +%define taglevel 0 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -39,29 +39,33 @@ rm -rf $RPM_BUILD_ROOT [ -d myplc ] || ln -s MyPLC myplc [ -d plcapi ] || ln -s PLCAPI plcapi [ -d nodemanager ] || ln -s NodeManager nodemanager -[ -d monitor ] || ln -s Monitor monitor +[ -d monitor ] || ln -s Monitor monitor pushd plcapi +# june2011 & f12, latex issues weird warnings, might need to try twice +make -C doc PLCAPI.pdf || make -C doc PLCAPI.pdf # 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 -C doc PLCAPI.html || make -C doc PLCAPI.html popd +# nodemanager is now optional +if [ -d nodemanager/doc ] ; then pushd nodemanager # beware that making the pdf file somehow overwrites the html -make -C doc NMAPI.pdf +make -C doc NMAPI.pdf || make -C doc NMAPI.pdf rm -f doc/NMAPI.html -make -C doc NMAPI.html +make -C doc NMAPI.html || make -C doc NMAPI.html popd +fi # not everyone rebuilds monitor, so make it optional -if [ -d monitor ] ; then +if [ -d monitor/docs ] ; then pushd monitor # beware that making the pdf file somehow overwrites the html -make -C docs Monitor.pdf +make -C docs Monitor.pdf || make -C docs Monitor.pdf rm -f docs/Monitor.html -make -C docs Monitor.html +make -C docs Monitor.html || make -C docs Monitor.html popd fi @@ -69,22 +73,26 @@ fi for ext in pdf html; do install -D -m 444 plcapi/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext + if [ -d nodemanager/doc ] ; then install -D -m 444 nodemanager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext - if [ -d monitor ] ; then + fi + if [ -d monitor/docs ] ; then install -D -m 444 monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext fi done ./myplc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.html \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.php + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.php +if [ -d nodemanager/doc ] ; then ./myplc/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.html \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.php -if [ -d monitor ] ; then + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.php +fi +if [ -d monitor/docs ] ; then ./myplc/docbook2drupal.sh "Monitor API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.html \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.php + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.php fi %clean @@ -95,6 +103,83 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/planetlab/doc/ %changelog +* Sat Apr 30 2022 Thierry Parmentelat - myplc-7.1-0 +- ready on f35 + +* Mon Jan 07 2019 Thierry Parmentelat - myplc-7.0-0 +- suitable for python3 on both f27 and f29 + +* Sun Jul 16 2017 Thierry Parmentelat - myplc-5.3-4 +- takes care of creating plcapi log file + +* Wed Feb 18 2015 Thierry Parmentelat - myplc-5.3-3 +- tweaked renew_reminder for federation + +* Fri Mar 21 2014 Thierry Parmentelat - myplc-5.3-2 +- tweaks in check-hrns.py +- do not require PyXML any more + +* Tue Dec 10 2013 Thierry Parmentelat - myplc-5.3-1 +- review check-hrns for plcapi-5.3 +- add PLC_HRN_ROOT in usual plc-config-tty's settings + +* Thu Oct 10 2013 Thierry Parmentelat - myplc-5.2-5 +- reduce the scope of check-hrns.py script, now that the SFA layer handles this natively +- add an rpm-sign dependency on feedora>=16 + +* Fri Jun 28 2013 Thierry Parmentelat - myplc-5.2-4 +- drop PLC_OMF_XMPP_{USER,PASSWORD} from config + +* Tue Apr 23 2013 Thierry Parmentelat - myplc-5.2-3 +- plc.d/gpg now does not rm /dev/random but preserves it +- this is because libvirt won't let us run mknod + +* Wed Apr 10 2013 Thierry Parmentelat - myplc-5.2-2 +- fix typo in check-hrns - used to print 'host' while dealing with persons + +* Thu Mar 07 2013 Thierry Parmentelat - myplc-5.2-1 +- supports httpd config for either mod_python (preferred) or mod_wsgi +- requires mod_wsgi on f18 only, otherwise mod_python +- supports httpd config for apache 2.4 (f18) +- new config variable PLC_FLAVOUR_VIRT_MAP to set 'virt' from fcdistro + +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-6 +- bugfix in check-vsys-defaults.py + +* Wed Dec 19 2012 Thierry Parmentelat - myplc-5.1-5 +- define open_basedir in php.ini to stop confidentiality leak +- new utility slice_ssh_keys.py for showing sliver keys (OMF interop) +- new config setting PLC_VSYS_DEFAULTS for vsys tags granted to all +- new utilities check-hrns.py and check-vsys-defaults.py + +* Fri Aug 31 2012 Thierry Parmentelat - myplc-5.1-4 +- set TimeoutSec to 300 in plc.service +- remove ref to deprecated svn $URL$ in db-config usage + +* Mon Jul 09 2012 Thierry Parmentelat - myplc-5.1-3 +- expose mtail.py as simply mtail + +* Mon May 07 2012 Thierry Parmentelat - myplc-5.1-2 +- plc-kml.py now has support for nodegroups + +* Mon Apr 16 2012 Thierry Parmentelat - myplc-5.1-1 +- use nodeimage package instead of deprecated bootstrapfs +- has systemd-friendly startup script +- plc_reload moved to functions/ - no more service plc reload +- no svn keywords anymore + +* Mon Sep 26 2011 Thierry Parmentelat - myplc-5.0-19 +- new maintenance/monitoring script spot-aliens to look for glitches in refreshpeer+sfa + +* Tue Jun 07 2011 Thierry Parmentelat - myplc-5.0-18 +- new settings for myslice (comon&tophat) and monitor (db) +- removed mentions of chroot in description +- can redo myplc-docs on broken f12-latex +- set short_open_tag in php.ini +- fixes in gen-sites-xml (is that still used ?) +- partial-repo.sh has moved to 'build' where it more belongs +- tweaks in convenience tool 'mtail' + * Tue Mar 22 2011 Thierry Parmentelat - myplc-5.0-17 - fixed changelog, no change from 5.0-16 @@ -330,7 +415,7 @@ rm -rf $RPM_BUILD_ROOT - figures in doc package * Fri May 09 2008 Thierry Parmentelat - MyPLC-4.2-11 -- no more doc packaged outside of myplc-docs - doc/ cleaned up +- no more doc packaged outside of myplc-docs - doc/ cleaned up - chroot packaging does not have docs anymore - 'cvs' and 'dev' not required from myplc-native anymore - cosmetic change in kml output