documentation for myplc has moved to https://svn.planet-lab.org/wiki/MyPLCUserGuide

[myplc.git] / myplc-docs.spec

diff --git a/myplc-docs.spec b/myplc-docs.spec
index 552c163..06092ef 100644 (file)
--- 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 11
+%define version 5.0
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -28,10 +28,10 @@ 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,
+in the form of the reference manuals for the two APIs provided: PLCAPI
+and NMAPI. A general introduction to the MyPLC system can be found at
+http://svn.planet-lab.org/wiki/MyPLCUserGuide
 
 %prep
 %setup -q
@@ -39,13 +39,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 
@@ -63,18 +56,14 @@ 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
 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 
 
@@ -86,9 +75,24 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %changelog
+* Tue May 20 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - MyPLC-4.2-15
+- Removed proper ops from planetflow slice.
+
+* Wed May 14 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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 <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-13
+- turn myplc-docs off for now
+
+* Sat May 10 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-12
+- figures in doc package
+
 * Fri May 09 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - 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