From: S.Çağlar Onur <caglar@verivue.com>
Date: Thu, 7 Apr 2011 17:28:12 +0000 (-0400)
Subject: Merge branch '4.3' of git.verivue.com:/git/planetlab/myplc into 4.3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4c63a06c528feea9cd50193eeec1351a534c7ec2;hp=-c;p=myplc.git

Merge branch '4.3' of git.verivue.com:/git/planetlab/myplc into 4.3
---

4c63a06c528feea9cd50193eeec1351a534c7ec2
diff --combined myplc-docs.spec
index abed528,e009ab0..adff3e4
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@@ -5,7 -5,7 +5,7 @@@
  
  %define name myplc-docs
  %define version 4.3
- %define taglevel 47
+ %define taglevel 48
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
@@@ -42,6 -42,7 +42,6 @@@ rm -rf $RPM_BUILD_ROO
  
  # using the new lowercase names, and handling legacy
  [ -d PLCAPI ] || ln -s plcapi PLCAPI
 -[ -d Monitor ] || ln -s monitor Monitor
  [ -d NodeManager ] || ln -s nodemanager NodeManager
  [ -d MyPLC ] || ln -s myplc MyPLC
  
@@@ -59,11 -60,19 +59,11 @@@ rm -f doc/NMAPI.htm
  make -C doc NMAPI.html 
  popd
  
 -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
 -
  %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
 -    install -D -m 444 Monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext
  done
  
  ./MyPLC/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \
@@@ -72,6 -81,9 +72,6 @@@
  ./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 
 -./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 
  
  %clean
  rm -rf $RPM_BUILD_ROOT
@@@ -81,6 -93,9 +81,9 @@@
  /var/www/html/planetlab/doc/
  
  %changelog
+ * Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
+ - Introduce staticroute tagtype
+ 
  * Mon Mar 21 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-47
  - attempt to fix small glitches