git://git.onelab.eu
/
myplc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'local_master/4.3' into 4.3
[myplc.git]
/
myplc-docs.spec
diff --git
a/myplc-docs.spec
b/myplc-docs.spec
index
e009ab0
..
3933105
100644
(file)
--- a/
myplc-docs.spec
+++ b/
myplc-docs.spec
@@
-5,7
+5,7
@@
%define name myplc-docs
%define version 4.3
%define name myplc-docs
%define version 4.3
-%define taglevel
48
+%define taglevel
50
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-42,7
+42,6
@@
rm -rf $RPM_BUILD_ROOT
# using the new lowercase names, and handling legacy
[ -d PLCAPI ] || ln -s plcapi PLCAPI
# 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
[ -d NodeManager ] || ln -s nodemanager NodeManager
[ -d MyPLC ] || ln -s myplc MyPLC
@@
-60,19
+59,11
@@
rm -f doc/NMAPI.html
make -C doc NMAPI.html
popd
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
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})" \
done
./MyPLC/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \
@@
-81,9
+72,6
@@
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
./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
%clean
rm -rf $RPM_BUILD_ROOT
@@
-93,6
+81,12
@@
rm -rf $RPM_BUILD_ROOT
/var/www/html/planetlab/doc/
%changelog
/var/www/html/planetlab/doc/
%changelog
+* Fri Apr 08 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-50
+- Do not preserve /etc/planetlab on upgrade operations
+
+* Thu Apr 07 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-49
+- Remove Monitor references from spec file
+
* Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
- Introduce staticroute tagtype
* Wed Apr 06 2011 S.Çağlar Onur <caglar@verivue.com> - myplc-4.3-48
- Introduce staticroute tagtype