- added BuildReq e2fsprogs-devel

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 97337c3d2ab4678f00eb7e4bb122312bd2b15696..9927d19893b816ca3ee6d4527dace5fc94267c6d 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -11,14 +11,14 @@
 %bcond_with    xalan           # use the xalan xslt processor
 #
 %define        _vproc_version 0.01
-# fails with ccache in %{__cc}
+# diet compile fails with ccache in %{__cc}
 %undefine      with_ccache
 #
 Summary:       Linux virtual server utilities
 Summary(pl):   Narzêdzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.210
-Release:       7.2
+Release:       10
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
@@ -37,6 +37,7 @@ Source9:      %{name}-pkgmgmt.txt
 Source10:      %{name}-initpost.sh
 Source11:      http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_version}.tar.bz2
 # Source11-md5:        1d030717bdbc958ea4b35fd2410dad85
+Source12:      %{name}-vhashify.cron
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
 Patch2:                %{name}-vrpm.patch
@@ -49,6 +50,10 @@ Patch8:              %{name}-vprocunhide.patch
 Patch9:                %{name}-dev.patch
 Patch10:       %{name}-no-dynamic-ctx.patch
 Patch11:       %{name}-more-ip.patch
+Patch12:       http://daniel.hozac.com/vserver/util-vserver/%{name}-0.30.210-namespace-cleanup.patch
+Patch13:       http://daniel.hozac.com/vserver/util-vserver/%{name}-0.30.210-delete.patch
+Patch14:       http://daniel.hozac.com/vserver/util-vserver/%{name}-0.30.210-shiny10.patch
+Patch15:       %{name}-rpm-fake-resolver-badperm-errorlogging.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -59,6 +64,7 @@ BuildRequires:        libtool >= 1.5.14
 %ifarch %{x8664}
 BuildRequires: sed >= 4.0
 %endif
+BuildRequires:  e2fsprogs-devel
 BuildRequires: rpmbuild(macros) >= 1.268
 %if %{with doc}
 BuildRequires: doxygen
@@ -169,8 +175,9 @@ Summary:    Tools which can be used to build vservers
 Summary(pl):   Narzêdzia do budowania vserverów
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
-Requires:      e2fsprogs
 Requires:      /etc/pld-release
+Requires:      e2fsprogs
+Requires:      which
 Conflicts:     poldek < 0.18.8-10
 
 %description build
@@ -327,6 +334,10 @@ konfiguracj
 %patch9 -p1
 %{?with_no_dynamic_context:%patch10 -p1}
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -366,7 +377,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d},/dev/pts} \
+install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d,cron.d},/dev/pts} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/vservices,/vservers/.pkg}
 
 %{__make} install install-distribution \
@@ -405,6 +416,11 @@ install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
 install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
+install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+
+cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF
+02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
+EOF
 
 ln -sf null $RPM_BUILD_ROOT/dev/initctl
 
@@ -542,7 +558,12 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/start-vservers
 %attr(755,root,root) %{_libdir}/%{name}/vprocunhide
 %{_libdir}/%{name}/vserver.*
+%{_libdir}/%{name}/vserver-setup.*
+%attr(755,root,root) %{_libdir}/%{name}/vserver-build
+%{_libdir}/%{name}/vserver-build.*
 %attr(755,root,root) %{_libdir}/%{name}/vservers.grabinfo.sh
+%attr(755,root,root) %{_libdir}/%{name}/vhashify
+%attr(755,root,root) %{_libdir}/%{name}/vhashify.cron
 %attr(755,root,root) %{_libdir}/%{name}/vshelper
 %attr(755,root,root) %{_libdir}/%{name}/vshelper-sync
 %{_mandir}/man8/chbind.8*
@@ -581,6 +602,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers
+%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/vservers
 %attr(754,root,root) /etc/rc.d/init.d/vprocunhide
 %attr(754,root,root) /etc/rc.d/init.d/vrootdevices
 %attr(754,root,root) /etc/rc.d/init.d/vservers
@@ -611,7 +633,6 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/pkgmgmt
 %attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker
 %attr(755,root,root) %{_libdir}/%{name}/vcopy
-%attr(755,root,root) %{_libdir}/%{name}/vhashify
 %attr(755,root,root) %{_libdir}/%{name}/vpkg
 %attr(755,root,root) %{_libdir}/%{name}/vpoldek-worker
 %attr(755,root,root) %{_libdir}/%{name}/vrpm-*