X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-docs.spec;h=a917ffb039509e659fb2de122d3c20ed729f11d9;hb=refs%2Ftags%2FMyPLC-4.3-10;hp=82edc189fd8b425aed2e42af303a5adff7da469e;hpb=d3c523524570c8cf2a88b532b6665525d4c41260;p=myplc.git diff --git a/myplc-docs.spec b/myplc-docs.spec index 82edc18..a917ffb 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -1,11 +1,11 @@ # -# $Id: myplc-native.spec 9260 2008-05-07 16:20:25Z thierry $ +# $Id$ # -%define url $URL: svn+ssh://thierry@svn.planet-lab.org/svn/MyPLC/trunk/myplc-native.spec $ +%define url $URL$ %define name myplc-docs -%define version 4.2 -%define taglevel 9 +%define version 4.3 +%define taglevel 10 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -28,10 +28,11 @@ BuildRequires: docbook-dtds, docbook-utils-pdf %define debug_package %{nil} -%description -This package contains the online documentation for MyPLC. This covers -the overall system itself, together with the reference manuals for the -two APIs provided, namely PLCAPI and NMAPI. +%description +This package contains the online documentation for MyPLC, i.e. the +reference manuals for the two APIs provided: PLCAPI and NMAPI. A +more general introduction to the MyPLC system can be found at +http://svn.planet-lab.org/wiki/MyPLCUserGuide %prep %setup -q @@ -39,13 +40,6 @@ two APIs provided, namely PLCAPI and NMAPI. %build rm -rf $RPM_BUILD_ROOT -pushd MyPLC -# beware that making the pdf file somehow overwrites the html -make -C doc myplc.pdf -rm -f doc/myplc.html -make -C doc myplc.html -popd - pushd PLCAPI # beware that making the pdf file somehow overwrites the html make -C doc PLCAPI.pdf @@ -60,23 +54,30 @@ rm -f doc/NMAPI.html make -C doc NMAPI.html popd +pushd Monitor +# beware that making the pdf file somehow overwrites the html +make -C docs Monitor.pdf +rm -f docs/Monitor.html +make -C docs Monitor.html +popd + %install for ext in pdf html; do - install -D -m 444 MyPLC/doc/myplc.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.$ext 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 + install -D -m 444 Monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext done -./MyPLC/doc/docbook2drupal.sh "MyPLC Documentation (%{pldistro})" \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.html \ - $RPM_BUILD_ROOT/var/www/html/planetlab/doc/myplc.php -./MyPLC/doc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \ +./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 -./MyPLC/doc/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \ +./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 +./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 %clean rm -rf $RPM_BUILD_ROOT @@ -86,3 +87,64 @@ rm -rf $RPM_BUILD_ROOT /var/www/html/planetlab/doc/ %changelog +* Fri May 15 2009 Thierry Parmentelat - MyPLC-4.3-10 +- tighter right permissions on site_admin's authorized keys for more robustness + +* Wed May 06 2009 Thierry Parmentelat - MyPLC-4.3-9 +- fix issue in db-config that prevented correct operation + +* Wed May 06 2009 Thierry Parmentelat - MyPLC-4.3-8 +- remove support for chroot-based packaging - no crond nor syslog step anymore +- plc init script now named plc.init instead of former guest.init + +* Mon May 04 2009 Stephen Soltesz - MyPLC-4.3-7 +- add Monitor to docs build + +* Wed Apr 29 2009 Marc Fiuczynski - MyPLC-4.3-6 +- plc_config.py and plc-config-tty: generalized to work for more diverse +- MyPLC configurations. +- plc.d/httpd: only update httpd_conf with /data for chroot'ed MyPLC +- deployments and increase the memory limits in php.ini +- plc.d/crond: add --full option to vacuumdb + +* Tue Apr 07 2009 Thierry Parmentelat - MyPLC-4.3-5 +- avoid generating ssl certificates for disabled services among www api boot + +* Mon Mar 30 2009 Thierry Parmentelat - MyPLC-4.3-4 +- cleaned up old entries in db-config +- mtail more robust + +* Tue Mar 24 2009 Thierry Parmentelat - MyPLC-4.3-3 +- php include path tweaked for plekit includes +- reviewed myplc (fka native) packaging dependencies +- renumbered 4.3 + +* Thu Jan 29 2009 Thierry Parmentelat - MyPLC-4.3-2 +- rename myplc into myplc-chroot and myplc-native into myplc +- new settings (shortname & hrn_root) for local peer + +* Wed Sep 10 2008 Thierry Parmentelat - MyPLC-4.3-1 +- First iteration of new data model +- Bunch of various fixes + +* Tue May 20 2008 Faiyaz Ahmed - MyPLC-4.2-15 +- Removed proper ops from planetflow slice. + +* Wed May 14 2008 Thierry Parmentelat - MyPLC-4.2-14 +- myplc-native requires myplc-docs +- fixed doc build by locating locally installed DTDs at build-time + +* Sun May 11 2008 Thierry Parmentelat - MyPLC-4.2-13 +- turn myplc-docs off for now + +* Sat May 10 2008 Thierry Parmentelat - MyPLC-4.2-12 +- 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 +- chroot packaging does not have docs anymore +- 'cvs' and 'dev' not required from myplc-native anymore +- cosmetic change in kml output + + +%define module_current_branch 4.2