- program PATHS merge from HEAD

[packages/util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index e74eac9f84c2c877cc8a445f76ff29c4e75a112a..10bdda0b778679593599f94f4813eceb42f16ab0 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,7 +18,7 @@ Summary:      Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.215
-Release:       10.5
+Release:       14
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -45,6 +45,7 @@ Source14:     ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 Source15:      %{name}.init
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
+Patch2:                %{name}-centos.patch
 Patch4:                %{name}-m4-diet.patch
 Patch5:                %{name}-yum-verb-nogpg.patch
 Patch6:                %{name}-build-umask.patch
@@ -62,8 +63,10 @@ Patch17:     %{name}-backupfiles.patch
 Patch18:       %{name}-trunk_fixes.patch
 Patch19:       %{name}-vprocunhide-net.patch
 Patch20:       %{name}-more-caps.patch
-Patch21:       http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
+# http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
+Patch21:       %{name}-dbrebuild-internalize4.patch
 Patch22:       %{name}-dev-stdfd.patch
+Patch23:       %{name}-bash-wrapper.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -129,8 +132,8 @@ set_ipv4root system call.
 
 This package contains utilities which are required to communicate with
 the Linux-Vserver enabled kernel, utilities which assist in building
-Vservers and SysV initscripts which start and stop Vservers and related
-tools.
+Vservers and SysV initscripts which start and stop Vservers and
+related tools.
 
 %description -l pl.UTF-8
 Ten pakiet dostarcza składniki i szkielet do tworzenia wirtualnych
@@ -357,6 +360,7 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %setup -q -a11
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -376,6 +380,7 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -395,17 +400,23 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
        --enable-apis=NOLEGACY \
        --with-initscripts=sysv \
        --%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
-       MKTEMP=/bin/mktemp \
-       MOUNT=/bin/mount \
-       PS=/bin/ps \
-       UMOUNT=/bin/umount \
+       FSCK=/sbin/fsck \
+       IONICE=%{_usrbin}/ionice \
        IP=/sbin/ip \
        IPTABLES=%{_usrsbin}/iptables \
+       MKTEMP=/bin/mktemp \
        MODPROBE=/sbin/modprobe \
+       MOUNT=/bin/mount \
        NAMEIF=/sbin/nameif \
+       PS=/bin/ps \
+       RESTORE=/sbin/restore \
        RMMOD=/sbin/rmmod \
+       RSYNC=%{_usrbin}/rsync \
+       STRACE=%{_usrbin}/strace \
+       UMOUNT=/bin/umount \
        VCONFIG=/sbin/vconfig \
        WGET=%{_usrbin}/wget \
+# end
 
 %{__make} all
 %{?with_doc:%{__make} doc}
@@ -426,7 +437,7 @@ install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
-       s=`basename $i | sed s/v_//`
+       s=$(basename $i | sed s/v_//)
        cat >$RPM_BUILD_ROOT%{_sysconfdir}/vservices/$s << EOF
 # IP addresses/interfaces to bound $s service to
 #IP=10.0.0.1
@@ -446,6 +457,8 @@ sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE15} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \
        $RPM_BUILD_ROOT/etc/sysconfig/vservers
+sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' gentoo/bash-wrapper > \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/bash-wrapper
 
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 
@@ -460,7 +473,6 @@ ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/ini
 %endif
 install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
-install gentoo/bash-wrapper $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
@@ -545,26 +557,20 @@ chmod a-x /etc/rc.d/init.d/vrootdevices
 chmod a-x /etc/rc.d/init.d/vservers
 
 %triggerpostun -- util-vserver-init
-# Restore what preun from util-vserver-init removed
+# Restore what triggerun removed
 chmod ug+x /etc/rc.d/init.d/vprocunhide
 chmod ug+x /etc/rc.d/init.d/vrootdevices
 chmod ug+x /etc/rc.d/init.d/vservers
 /sbin/chkconfig --add vrootdevices
 /sbin/chkconfig --add vprocunhide
 /sbin/chkconfig --add vservers
-if [ ! -f /etc/sysconfig/vrootdevices ]; then
-       if [ ! -f /etc/sysconfig/vrootdevices.rpmsave ]; then
-               mv -f /etc/sysconfig/vrootdevices.rpmsave /etc/sysconfig/vrootdevices
-       else
-               mv -f /etc/sysconfig/vrootdevices.rpmnew /etc/sysconfig/vrootdevices
-       fi
+if [ -f /etc/sysconfig/vrootdevices.rpmsave ]; then
+       cp -f /etc/sysconfig/vrootdevices{,.rpmnew}
+       mv -f /etc/sysconfig/vrootdevices{.rpmsave,}
 fi
-if [ ! -f /etc/sysconfig/vservers ]; then
-       if [ -f /etc/sysconfig/vservers.rpmsave ]; then
-               mv -f /etc/sysconfig/vservers.rpmsave /etc/sysconfig/vservers
-       else
-               mv -f /etc/sysconfig/vservers.rpmnew /etc/sysconfig/vservers
-       fi
+if [ -f /etc/sysconfig/vservers.rpmsave ]; then
+       cp -f /etc/sysconfig/vservers{,.rpmnew}
+       mv -f /etc/sysconfig/vservers{.rpmsave,}
 fi
 
 %post