err, stupid pointer error

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

diff --git a/util-vserver.spec b/util-vserver.spec
index ee3266cc4cc46d7fcca31f2a437e9dc66b196dc9..4b0fbf8780f2f34adff75dfa85370a16ac864214 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -15,10 +15,11 @@
 %undefine      with_doc
 %endif
 
-# reqdb_pkg should match value from current rpm package in distro
-%define                reqdb_pkg       db5.2
-%define                snap    pre3034
-%define                rel     7
+# reqdb_pkg and reqdb_ver must match value from current rpm package in distro
+%define                reqdb_ver       5.2
+%define                reqdb_pkg       db%{reqdb_ver}
+%define                snap    pre3038
+%define                rel     5
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
@@ -27,7 +28,7 @@ Release:      1.%{snap}.%{rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: c0f708814ff48532802a5fb04514a86c
+# Source0-md5: 21ae909b16d57fdb169743cde35e896d
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -77,6 +78,8 @@ Patch25:      stat.patch
 Patch26:       %{name}-am.patch
 Patch27:       %{name}-rpm5.patch
 Patch28:       diet-ccache.patch
+Patch29:       %{name}-centos6.patch
+Patch30:       vsysctl-ignore-files.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -119,11 +122,11 @@ Requires(post,preun):     /sbin/chkconfig
 Requires:      %{name}-lib = %{version}-%{release}
 Requires:      coreutils
 Requires:      diffutils
-Requires:      issue
+Requires:      pld-release
 Requires:      make
 Requires:      mktemp >= 1.5-18
 Requires:      rc-scripts >= 0.4.3.4
-#Requires:     rpm >= 3.4.10-36
+#Requires:     rpm >= 5.4.10-36
 Requires:      tar
 Requires:      uname(release) >= 2.6.27
 Requires:      util-linux >= 2.13
@@ -444,9 +447,13 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
+%patch30 -p1
 
 cp -p %{SOURCE9} package-management.txt
 
+%{__sed} -i -e "s/@RPMDB@/%{reqdb_ver}/g" scripts/pkgmgmt
+
 %build
 unset LD_SYMBOLIC_FUNCTIONS || :