X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myplc-docs.spec;h=19aad78b7fb269997402ecad31039d397e4f0b8c;hb=9484314a715e4729c845e2227610a40967ce54b2;hp=e3ad28a31ae0656b9b27816e0247b6ba1b93a3aa;hpb=732a0fd6d8d7f94ee2ed99ddd3b5b9a41d8ea0e3;p=myplc.git

diff --git a/myplc-docs.spec b/myplc-docs.spec
index e3ad28a..19aad78 100644
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -1,11 +1,6 @@
-#
-# $Id$
-#
-%define url $URL$
-
 %define name myplc-docs
 %define version 5.0
-%define taglevel 10
+%define taglevel 17
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -22,7 +17,7 @@ BuildArch: noarch
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 BuildRequires: docbook-dtds, docbook-utils-pdf
 
@@ -41,10 +36,10 @@ http://svn.planet-lab.org/wiki/MyPLCUserGuide
 rm -rf $RPM_BUILD_ROOT
 
 # using the new lowercase names, and handling legacy
+[ -d myplc ] || ln -s MyPLC myplc
 [ -d plcapi ] || ln -s PLCAPI plcapi
-[ -d monitor ] || ln -s Monitor monitor 
 [ -d nodemanager ] || ln -s NodeManager nodemanager
-[ -d myplc ] || ln -s MyPLC myplc
+[ -d monitor ] || ln -s Monitor monitor 
 
 pushd plcapi
 # beware that making the pdf file somehow overwrites the html
@@ -60,19 +55,24 @@ rm -f doc/NMAPI.html
 make -C doc NMAPI.html 
 popd
 
+# not everyone rebuilds monitor, so make it optional
+if [ -d monitor ] ; then
 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
+fi
 
 %install
 
 for ext in pdf html; do
     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
+    if [ -d monitor ] ; then
     install -D -m 444 monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext
+    fi
 done
 
 ./myplc/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \
@@ -81,9 +81,11 @@ done
 ./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 
+if [ -d monitor ] ; then
 ./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 
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -93,6 +95,28 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %changelog
+* Tue Mar 22 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-17
+- fixed changelog, no change from 5.0-16
+
+* Mon Mar 21 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-16
+- requires ed for the plc.d/packages step
+- sirius initscript to handle stop and restart
+
+* Fri Feb 04 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-15
+- ignore steps in db-config.d if they have a '.' or '~' in their name
+
+* Wed Jan 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-14
+- can redo myplc-docs without the doc for monitor
+
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-13
+- no semantic change - just fixed specfile for git URL
+
+* Wed Dec 01 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-12
+- needed for plcapi-5.0-19, i.e. tag permissions based on roles
+
+* Mon Oct 04 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - myplc-5.0-11
+- add missing files to rpm package
+
 * Mon Oct 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-10
 - mtail.py -s for SFA
 - spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa