X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-docs.spec;h=06092ef4deb228918b4af9da0b82d77b55a87d4c;hb=11c223899d4224f6ed031aa4ba789d10f8632bcb;hp=c8514320fb171e9c69c9769472e2ba38f512e762;hpb=e31ec65eb24d6ae153343cb2a91969fb70659f71;p=myplc.git

diff --git a/myplc-docs.spec b/myplc-docs.spec
index c851432..06092ef 100644
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -1,7 +1,7 @@
 #
-# $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 5.0
@@ -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,23 +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 figures
-for ext in eps png; do 
-    install -m 444 MyPLC/doc/architecture.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/architecture.$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