X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Futil-vserver.spec.in;h=d0e4f0bab89d4d8667a3bf9b7f5d3e14f4682c8d;hb=17e62ad64ea62a4fd0c74a44ab5b8b18e8c1bcd2;hp=61c3ede0ec572f565e6d88b0bf68fa4dc89f313f;hpb=d4316bbb5f36c00814c16cc50c509b85fe286ae9;p=util-vserver.git diff --git a/util-vserver/util-vserver.spec.in b/util-vserver/util-vserver.spec.in index 61c3ede..d0e4f0b 100644 --- a/util-vserver/util-vserver.spec.in +++ b/util-vserver/util-vserver.spec.in @@ -10,14 +10,17 @@ Source0: http://savannah.nongnu.org/download/util-vserver/stable.pkg/%version/%n Provides: %name-devel = %epoch:%version-%release BuildRoot: %_tmppath/%name-%version-%release-root Provides: vserver = %epoch:%version-%release -Conflicts: vserver < %epoch:%version +Conflicts: vserver < %epoch:%version-%release +Conflicts: vserver > %epoch:%version-%release +BuildRequires: e2fsprogs-devel %package linuxconf Summary: Linuxconf administration modules for vservers Group: Applications/System Requires: %name = %epoch:%version-%release Provides: vserver-admin = %epoch:%version-%release -Conflicts: vserver-admin < %epoch:%version +Conflicts: vserver-admin < %epoch:%version-%release +Conflicts: vserver-admin > %epoch:%version-%release %description This package provides the components and a framework to setup virtual @@ -40,7 +43,7 @@ linuxconf. %build -%configure +%configure --enable-linuxconf %__make %{?_smp_mflags} @@ -48,6 +51,7 @@ linuxconf. rm -rf $RPM_BUILD_ROOT %__make DESTDIR=$RPM_BUILD_ROOT install +mkdir -p $RPM_BUILD_ROOT/vservers test "%_initrddir" = %_sysconfdir/init.d || { mkdir -p ${RPM_BUILD_ROOT}%_initrddir mv ${RPM_BUILD_ROOT}%_sysconfdir/init.d/* ${RPM_BUILD_ROOT}%_initrddir/ @@ -93,6 +97,7 @@ test "$1" = 0 || %{_initrddir}/rebootmgr condrestart >/dev/null || : %_mandir/man8/* %config %_initrddir/* %config(noreplace) /etc/vservers.conf +%attr(0,root,root) %dir /vservers %exclude %_sbindir/newvserver %exclude %_mandir/man8/newvserver*