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.spec
diff --git
a/myplc.spec
b/myplc.spec
index
60a3ce2
..
bb32a21
100644
(file)
--- a/
myplc.spec
+++ b/
myplc.spec
@@
-5,7
+5,7
@@
%define name myplc
%define version 4.3
%define name myplc
%define version 4.3
-%define taglevel
48
+%define taglevel
50
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@
-65,7
+65,6
@@
Requires: vixie-cron
Requires: bootmanager
Requires: bootcd-%{pldistro}-%{_arch}
Requires: PLCWWW
Requires: bootmanager
Requires: bootcd-%{pldistro}-%{_arch}
Requires: PLCWWW
-Requires: www-register-wizard
Requires: nodeconfig
Requires: PLCAPI
Requires: pcucontrol
Requires: nodeconfig
Requires: PLCAPI
Requires: pcucontrol
@@
-149,7
+148,7
@@
fi
# 0 = install, 1 = upgrade
if [ $1 -gt 0 ] ; then
# 0 = install, 1 = upgrade
if [ $1 -gt 0 ] ; then
- for dir in /var/lib/pgsql/data
/etc/planetlab
; do
+ for dir in /var/lib/pgsql/data ; do
if [ -d $dir ] ; then
echo "Preserving $dir"
mkdir -p $dir.rpmsave
if [ -d $dir ] ; then
echo "Preserving $dir"
mkdir -p $dir.rpmsave
@@
-172,7
+171,7
@@
fi
%triggerpostun -- %{name}
# 0 = erase, 1 = upgrade
if [ $1 -gt 0 ] ; then
%triggerpostun -- %{name}
# 0 = erase, 1 = upgrade
if [ $1 -gt 0 ] ; then
- for dir in /var/lib/pgsql/data
/etc/planetlab
; do
+ for dir in /var/lib/pgsql/data ; do
if [ -d $dir.rpmsave -a -d $dir ] ; then
echo "Merging $dir"
if tar -C $dir.rpmsave -cpf - . | \
if [ -d $dir.rpmsave -a -d $dir ] ; then
echo "Merging $dir"
if tar -C $dir.rpmsave -cpf - . | \
@@
-222,6
+221,12
@@
fi
%changelog
%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