git://git.onelab.eu
/
vserver-reference.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove ugly hack that breaks su/sudo on upgrades.
[vserver-reference.git]
/
vserver-reference.spec
diff --git
a/vserver-reference.spec
b/vserver-reference.spec
index
2c06616
..
80167e3
100644
(file)
--- a/
vserver-reference.spec
+++ b/
vserver-reference.spec
@@
-7,7
+7,7
@@
%define name vserver
%define version 5.0
%define name vserver
%define version 5.0
-%define taglevel
3
+%define taglevel
4
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@
-46,7
+46,6
@@
Summary: VServer reference image
Group: Applications/System
AutoReqProv: no
Requires: util-vserver, e2fsprogs, yum
Group: Applications/System
AutoReqProv: no
Requires: util-vserver, e2fsprogs, yum
-Requires(pre): util-vserver-core, findutils
%description %{slicefamily}
This package creates the virtual server (VServer) reference image used
%description %{slicefamily}
This package creates the virtual server (VServer) reference image used
@@
-98,12
+97,6
@@
rm -rf $RPM_BUILD_ROOT
%define vcached_pid /var/run/vcached.pid
%define vcached_pid /var/run/vcached.pid
-# XXX: UGLY HACK
-%pre %{slicefamily}
-test -d /vservers/.vref/%{slicefamily} && \
- find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink
-:
-
%post %{slicefamily}
chkconfig --add vserver-reference
chkconfig vserver-reference on
%post %{slicefamily}
chkconfig --add vserver-reference
chkconfig vserver-reference on
@@
-120,6
+113,9
@@
sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference
[ "$PL_BOOTCD" = "1" ] || service vserver-reference force
%changelog
[ "$PL_BOOTCD" = "1" ] || service vserver-reference force
%changelog
+* Tue Dec 07 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-reference-5.0-4
+- optimize rpm construction - skips stripping and the like
+
* Mon Jul 05 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - VserverReference-5.0-3
- module name changes
* Mon Jul 05 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - VserverReference-5.0-3
- module name changes