From: Mark Huang Date: Fri, 15 Dec 2006 20:43:10 +0000 (+0000) Subject: merge changes from HEAD X-Git-Tag: planetlab-3_3-rc2~1 X-Git-Url: http://git.onelab.eu/?p=util-vserver.git;a=commitdiff_plain;h=refs%2Fheads%2Fplanetlab-3_3-branch merge changes from HEAD --- diff --git a/Makefile.am b/Makefile.am index 758a67c..068605c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -241,10 +241,10 @@ nodist_lib_dietlibc_not_enabled_error_a_SOURCES = \ endif install-exec-hook: - cd $(DESTDIR)$(sbindir) && $(LN_S) vuseradd vadduser - cd $(DESTDIR)$(sbindir) && $(LN_S) vuserdel vdeluser + cd $(DESTDIR)$(sbindir) && $(LN_S)f vuseradd vadduser + cd $(DESTDIR)$(sbindir) && $(LN_S)f vuserdel vdeluser mkdir -p $(DESTDIR)/bin - cd $(DESTDIR)/bin && $(LN_S) ../$(sbindir)/vsh + cd $(DESTDIR)/bin && $(LN_S)f ../$(sbindir)/vsh install-data-hook: install -D -m 644 scripts/vcached.logrotate $(DESTDIR)/$(sysconfdir)/logrotate.d/vcached diff --git a/util-vserver.spec b/util-vserver.spec index c482a0f..87bf786 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -17,7 +17,7 @@ %define name util-vserver %define version 0.30.208 -%define release 14%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 15%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define _without_dietlibc 1 %define _without_xalan 1 diff --git a/util-vserver.spec.in b/util-vserver.spec.in index 7949c98..1d47165 100644 --- a/util-vserver.spec.in +++ b/util-vserver.spec.in @@ -17,7 +17,7 @@ %define name @PACKAGE@ %define version @VERSION@ -%define release 13%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 15%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define _without_dietlibc 1 %define _without_xalan 1