From d3c523524570c8cf2a88b532b6665525d4c41260 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 8 May 2008 10:51:24 +0000 Subject: [PATCH] remove other doc building stuff --- build.sh | 29 +++-------------------------- myplc-docs.spec | 2 ++ myplc.spec | 2 +- 3 files changed, 6 insertions(+), 27 deletions(-) diff --git a/build.sh b/build.sh index ae038a2..4a2c6d2 100755 --- a/build.sh +++ b/build.sh @@ -99,32 +99,9 @@ install -m 444 myplc-release root/etc/myplc-release # yum_conf_to_build_host is defined in build.functions yum_conf_to_build_host ../build > root/etc/yum.conf -### Thierry Parmentelat - july 20 2007 -# we now build the myplc doc -# 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 - -# install at the same place as plcapi - better ideas ? -for doc in myplc.html myplc.pdf ; do - install -m 644 doc/$doc root/usr/share/plc_api/doc/$doc -done - -# we now build the plcapi doc -# this generates a drupal php file from a docbook-generated html -# quick & dirty -./doc/docbook2drupal.sh "${pldistro} PLCAPI Documentation" \ - root/usr/share/plc_api/doc/PLCAPI.html \ - root/var/www/html/planetlab/doc/plcapi.php -# pdf just get copied -install -m 644 root/usr/share/plc_api/doc/PLCAPI.pdf root/var/www/html/planetlab/doc/plcapi.pdf - -./doc/docbook2drupal.sh "Myplc User Guide" \ - root/usr/share/plc_api/doc/myplc.html \ - root/var/www/html/planetlab/doc/myplc.php -# pdf just get copied -install -m 644 root/usr/share/plc_api/doc/myplc.pdf root/var/www/html/planetlab/doc/myplc.pdf +### Thierry Parmentelat - may 8 2008 +# no doc built in this old-fashioned packaging anymore +# use myplc-docs instead # Install configuration file echo "* myplc: Installing configuration file" diff --git a/myplc-docs.spec b/myplc-docs.spec index 7f34562..82edc18 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -24,6 +24,8 @@ Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} URL: %(echo %{url} | cut -d ' ' -f 2) +BuildRequires: docbook-dtds, docbook-utils-pdf + %define debug_package %{nil} %description diff --git a/myplc.spec b/myplc.spec index 9f2704e..ea269b3 100644 --- a/myplc.spec +++ b/myplc.spec @@ -173,7 +173,7 @@ fi - defaults for *_IP conf vars now void, expect more accurate /etc/hosts - gethostbyname uses python rather than perl (hope this shrinks deps) - doc: reviewed myplc doc - deprecated everything related to myplc-devel -- doc: packaging doc in myplc-native (myplc&PLCAPI) & rm'ed target files from svn +- doc: packaging doc in myplc-native (myplc&PLCAPI) & removed target files from svn - make sync now works towards vserver-based myplc only * Mon May 05 2008 Stephen Soltesz - MyPLC-4.2-9 -- 2.47.0