- up to pre2864 snap

- fixed sed invocation on vhashify.cron

Changed files:
    util-vserver-centos.patch -> 1.2
    util-vserver.spec -> 1.253

diff --git a/util-vserver-centos.patch b/util-vserver-centos.patch
index 02f86183c98e10ffa1c9b926b60c991d1c942f51..da425bea40cd56a0e1a8ed4db3bba1b8125a4030 100644 (file)
--- a/util-vserver-centos.patch
+++ b/util-vserver-centos.patch
@@ -6,7 +6,7 @@ diff -Nur util-vserver-0.30.215/distrib.org/defaults/rpm/macros util-vserver-0.3
  # you have to use at least one language beside 'C'
 -%_install_langs               C:de:en:es:fr
 +%_install_langs         C:en:pl
- %_netsharedpath               /dev:/etc/rc.d/init.d/halt:/sbin/new-kernel-pkg:/usr/bin/rhgb-client
+ %_netsharedpath               /dev:/etc/rc.d/init.d/halt:/sbin/new-kernel-pkg:/usr/bin/rhgb-client:/proc
 +%_check_dirname_deps    0
 diff -Nur util-vserver-0.30.215/distrib.org/redhat/initpre util-vserver-0.30.215/distrib/redhat/initpre
 --- util-vserver-0.30.215/distrib.org/redhat/initpre   2008-03-17 08:59:48.000000000 +0000

diff --git a/util-vserver.spec b/util-vserver.spec
index 7faca55b86dc88cdde4d300520d5435adbbd099c..7ad0325396bcd476468fe6ae0506258046bce434 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,8 +18,8 @@
 %undefine      with_doc
 %endif
 
-%define                snap    pre2849
-%define                rel             5
+%define                snap    pre2864
+%define                rel             1
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
@@ -28,7 +28,7 @@ Release:      0.%{snap}.%{rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: af4c22b420320bdd94a1756f3c90de20
+# Source0-md5: f686d72b39399fba96bbabd7debab549
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -71,7 +71,6 @@ Patch18:      %{name}-vprocunhide-net.patch
 Patch19:       %{name}-dbrebuild-internalize4.patch
 Patch21:       %{name}-bash-wrapper.patch
 Patch22:       %{name}-pivot-root-ugly-hack.patch
-Patch23:       %{name}-ac.patch
 Patch24:       vunify-more-exclude.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
@@ -397,7 +396,6 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch19 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p0
 %patch24 -p1
 
 install %{SOURCE9} package-management.txt
@@ -484,7 +482,7 @@ ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/ini
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
 %endif
 install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
-sed -i -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+sed -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
 cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF