X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=blobdiff_plain;f=myplc-docs.spec;h=be1d0826236c04a253f6698e4c64cb9e74c97c12;hp=5798248b301c7eecde57fb636e076d16598fc305;hb=cbbfeee8979dcbf81d504d1ee6bd2dd083e2349f;hpb=97e355c3758aeef88211c8bd75c1b422ac8653b6 diff --git a/myplc-docs.spec b/myplc-docs.spec index 5798248..be1d082 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -1,11 +1,6 @@ -# -# $Id$ -# -%define url $URL$ - %define name myplc-docs -%define version 5.0 -%define taglevel 11 +%define version 5.1 +%define taglevel 6 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -22,7 +17,7 @@ BuildArch: noarch Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} BuildRequires: docbook-dtds, docbook-utils-pdf @@ -41,38 +36,44 @@ http://svn.planet-lab.org/wiki/MyPLCUserGuide rm -rf $RPM_BUILD_ROOT # using the new lowercase names, and handling legacy +[ -d myplc ] || ln -s MyPLC myplc [ -d plcapi ] || ln -s PLCAPI plcapi -[ -d monitor ] || ln -s Monitor monitor [ -d nodemanager ] || ln -s NodeManager nodemanager -[ -d myplc ] || ln -s MyPLC myplc +[ -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 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 +# not everyone rebuilds monitor, so make it optional +if [ -d monitor ] ; 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 %install for ext in pdf html; do install -D -m 444 plcapi/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext install -D -m 444 nodemanager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext + if [ -d monitor ] ; 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})" \ @@ -81,9 +82,11 @@ done ./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 ./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 +fi %clean rm -rf $RPM_BUILD_ROOT @@ -93,6 +96,62 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/planetlab/doc/ %changelog +* 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 + +* Mon Mar 21 2011 Thierry Parmentelat - myplc-5.0-16 +- requires ed for the plc.d/packages step +- sirius initscript to handle stop and restart + +* Fri Feb 04 2011 Thierry Parmentelat - myplc-5.0-15 +- ignore steps in db-config.d if they have a '.' or '~' in their name + +* Wed Jan 26 2011 Thierry Parmentelat - myplc-5.0-14 +- can redo myplc-docs without the doc for monitor + +* Mon Jan 24 2011 Thierry Parmentelat - myplc-5.0-13 +- no semantic change - just fixed specfile for git URL + +* Wed Dec 01 2010 Thierry Parmentelat - myplc-5.0-12 +- needed for plcapi-5.0-19, i.e. tag permissions based on roles + * Mon Oct 04 2010 Baris Metin - myplc-5.0-11 - add missing files to rpm package