- vhashify is in %{_libdir}; rel 5

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 902cf67fa1b73f9ab107f252a3294a889f951624..7faca55b86dc88cdde4d300520d5435adbbd099c 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -8,23 +8,23 @@
 %bcond_without doc                     # don't build documentation which needed LaTeX
 %bcond_without no_dynamic_context      # disable enforcement of disabled dynamic context
 %bcond_with    xalan                   # use the xalan xslt processor
-#
+
 %define        vproc_version 0.01
 # diet compile fails with ccache in %{__cc}
 %undefine      with_ccache
-#
+
 %ifarch ppc
 # pdflatex: refman: Invalid argument
 %undefine      with_doc
 %endif
-#
+
 %define                snap    pre2849
-#
+%define                rel             5
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.216
-Release:       0.%{snap}.1
+Release:       0.%{snap}.%{rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
@@ -69,7 +69,6 @@ Patch17:      %{name}-backupfiles.patch
 Patch18:       %{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
 Patch19:       %{name}-dbrebuild-internalize4.patch
-Patch20:       %{name}-dev-stdfd.patch
 Patch21:       %{name}-bash-wrapper.patch
 Patch22:       %{name}-pivot-root-ugly-hack.patch
 Patch23:       %{name}-ac.patch
@@ -396,7 +395,6 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p0
@@ -486,7 +484,8 @@ 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}
-install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+sed -i -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
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
@@ -655,7 +654,7 @@ exit 0
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS THANKS doc/intro.txt
-%doc contrib/yum*.patch package-management.txt
+%doc package-management.txt
 %{?with_doc:%doc doc/*.html}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers