- -build R: e2fsprogs due chattr requirement

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 1713fca0f05a9a057d7a7c9a1bf69513bc9ec601..f9f0cf9fd3d409f170d796d1f1caa41d9f50b864 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,3 +1,5 @@
+# TODO
+# - somewhy empty /var/cache/vservers is needed when building pld vserver
 #
 # m68k and mips are the only not supported archs
 #
@@ -10,7 +12,7 @@ Summary:      Linux virtual server utilities
 Summary(pl):   Narzêdzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.210
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
@@ -53,17 +55,17 @@ BuildRequires:      tetex-format-pdflatex
 BuildRequires: tetex-makeindex
 # To be removed when tetex-format-pdflatex, tetex-pdftex...
 # ...and graphviz packages get fixed
-BuildRequires: tetex-fonts-jknappen
-BuildRequires: tetex-metafont
 BuildRequires: ghostscript
 BuildRequires: ghostscript-fonts-std
+BuildRequires: tetex-fonts-jknappen
+BuildRequires: tetex-metafont
 %{?with_xalan:BuildRequires:   xalan-j}
 %endif
+Requires(post,preun):  /sbin/chkconfig
+Requires:      %{name}-lib = %{version}-%{release}
 Requires:      issue
 Requires:      rc-scripts
 Requires:      util-linux
-Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-lib = %{version}-%{release}
 Obsoletes:     util-vserver-core
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -133,7 +135,7 @@ Group:              Libraries
 util-vserver provides the components and a framework to setup virtual
 servers. A virtual server runs inside a linux server. It is
 nevertheless highly independent. As such, you can run various services
-with normal configuration. The various vservers can't interact with
+pith normal configuration. The various vservers can't interact with
 each other and can't interact with services in the main server.
 
 This package contains the shared libraries needed by all other
@@ -153,8 +155,9 @@ podpakiety util-vserver.
 Summary:       Tools which can be used to build vservers
 Summary(pl):   Narzêdzia do budowania vserverów
 Group:         Applications/System
-Conflicts:     poldek < 0.18.8-10
 Requires:      %{name} = %{version}-%{release}
+Requires:      e2fsprogs
+Conflicts:     poldek < 0.18.8-10
 
 %description build
 util-vserver provides the components and a framework to setup virtual
@@ -332,7 +335,7 @@ NIE INSTALUJ tego pakietu na zwyk
 %patch6 -p1
 %patch7 -p1
 
-install %{SOURCE9} package-managament.txt
+install %{SOURCE9} package-management.txt
 
 cp -a compat.h vserver-compat.h
 
@@ -413,6 +416,9 @@ sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-
 sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpmlist.d/00.lst
 %endif
 
+# baggins check this: needed but seems unused
+install -d $RPM_BUILD_ROOT/var/cache/vservers
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -558,6 +564,7 @@ fi
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
+%dir /var/cache/vservers
 
 %files devel
 %defattr(644,root,root,755)
@@ -586,7 +593,7 @@ fi
 
 %files build
 %defattr(644,root,root,755)
-%doc contrib/yum*.patch package-managament.txt
+%doc contrib/yum*.patch package-management.txt
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify/hash
 %dir %{_sysconfdir}/vservers/.distributions