X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-native.spec;h=f4dcb7f90fff5478063b5189ba41ab8940869936;hb=refs%2Ftags%2FMyPLC-4.3-0;hp=9008513430f6449336cf415e7eb846c2808d5356;hpb=4d3eb0f230df155faa31ba74bd039cf539ac3db0;p=myplc.git

diff --git a/myplc-native.spec b/myplc-native.spec
index 9008513..f4dcb7f 100644
--- a/myplc-native.spec
+++ b/myplc-native.spec
@@ -4,8 +4,8 @@
 %define url $URL$
 
 %define name myplc-native
-%define version 4.2
-%define taglevel 10
+%define version 5.0
+%define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -59,8 +59,6 @@ Requires: php
 Requires: xmlsec1-openssl
 Requires: postgresql
 Requires: openssh
-Requires: cvs
-Requires: dev
 Requires: bootcd-%{pldistro}-%{_arch}
 Requires: dnsmasq
 Requires: diffutils
@@ -71,6 +69,7 @@ Requires: PLCWWW
 Requires: nodeconfig
 Requires: PLCAPI
 Requires: bootstrapfs-%{pldistro}-%{_arch}
+Requires: myplc-docs
 
 Provides: myplc
 
@@ -154,23 +153,6 @@ fi
 pushd /usr/share/myplc &> /dev/null
 python plc_config.py build
 python plc_config.py install
-# build drupal docs - this is crappy but at least we keep PLCAPI out
-# also, we copy everythong in the same place
-mkdir -p /var/www/html/planetlab/doc
-if [ -f /usr/share/plc_api/doc/PLCAPI.html ] ; then
-    cp /usr/share/plc_api/doc/PLCAPI.{html,pdf} /var/www/html/planetlab/doc
-    ./docbook2drupal.sh "PLCAPI Documentation" \
-	/var/www/html/planetlab/doc/PLCAPI.html \
-	/var/www/html/planetlab/doc/PLCAPI.php
-fi || :
-# same for the PLCAPI doc
-if [ -f /usr/share/myplc/doc/myplc.html ] ; then
-    cp /usr/share/myplc/doc/myplc.{html,pdf} /var/www/html/planetlab/doc
-    ./docbook2drupal.sh "Myplc User Guide" \
-	/var/www/html/planetlab/doc/myplc.html \
-	/var/www/html/planetlab/doc/myplc.php
-fi || :
-
 popd &> /dev/null
 
 %triggerpostun -- %{name}
@@ -220,11 +202,30 @@ fi
 /var/www/html/install-rpms/planetlab
 
 %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
+
 * Thu May 08 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - MyPLC-4.2-10
 - 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 <soltesz@cs.princeton.edu> - MyPLC-4.2-9
@@ -270,3 +271,5 @@ fi
 
 * Fri Aug 31 2007 Marc E. Fiuczynski <mef@CS.Princeton.EDU>
 - initial build.
+
+%define module_current_branch 4.2