X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=a11ef908e82e05813d7c14a91a8eeb1257650134;hb=65ef83022a01c48b90f053a00f05991fae416170;hp=1129bbb6ed16abe99bda4697bae95e2a588f5a78;hpb=99e1c7ab099a84ad53d414a0b1efe21c1052a545;p=packages%2Futil-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 1129bbb..a11ef90 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,8 +18,8 @@
 # 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	pre3054
-%define		rel	2
+%define		snap	pre3062
+%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:	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:	d6fe16a0dbde811ae0672ca69aaf01c5
+# Source0-md5:	c67c795a8f4a217f4d2ddf665ad040f8
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -57,7 +57,6 @@ Patch3:		%{name}-tld.patch
 Patch4:		%{name}-m4-diet.patch
 Patch5:		%{name}-yum-verb-nogpg.patch
 Patch6:		%{name}-build-umask.patch
-Patch7:		%{name}-utmpx.patch
 Patch8:		%{name}-vprocunhide.patch
 Patch9:		%{name}-dev.patch
 Patch10:	%{name}-no-dynamic-ctx.patch
@@ -67,7 +66,7 @@ Patch13:	%{name}-tmpdir.patch
 Patch14:	%{name}-rpmpath.patch
 Patch15:	%{name}-interfaces-ignore-cvs-dir.patch
 Patch16:	%{name}-personalitymachine.patch
-Patch17:	%{name}-backupfiles.patch
+
 Patch18:	%{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
 Patch19:	%{name}-dbrebuild-internalize4.patch
@@ -112,6 +111,7 @@ BuildRequires:	texlive-format-pdflatex
 BuildRequires:	texlive-latex-ams
 BuildRequires:	texlive-latex-extend
 BuildRequires:	texlive-latex-ucs
+BuildRequires:	texlive-latex-wasysym
 BuildRequires:	texlive-makeindex
 BuildRequires:	texlive-pdftex
 BuildRequires:	texlive-xetex
@@ -122,9 +122,10 @@ Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	coreutils
 Requires:	diffutils
-Requires:	pld-release
+Requires:	glibc-misc
 Requires:	make
 Requires:	mktemp >= 1.5-18
+Requires:	pld-release
 Requires:	rc-scripts >= 0.4.3.4
 #Requires:	rpm >= 5.4.10-36
 Requires:	tar
@@ -132,6 +133,7 @@ Requires:	uname(release) >= 2.6.27
 Requires:	util-linux >= 2.13
 Requires:	vserver-distro-pld = %{version}-%{release}
 Suggests:	%{reqdb_pkg}-utils
+Suggests:	crondaemon
 Obsoletes:	util-vserver-build
 Obsoletes:	util-vserver-core
 Obsoletes:	util-vserver-init
@@ -427,7 +429,6 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %{?with_no_dynamic_context:%patch10 -p1}
@@ -437,7 +438,7 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
+
 %patch18 -p1
 %patch19 -p1
 %patch21 -p1
@@ -512,6 +513,12 @@ install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 %endif
 	DESTDIR=$RPM_BUILD_ROOT
 
+%ifarch %{ix86}
+# fix breakage caused by too many substitiutions on x86
+%{__sed} -i -e 's|%{_datadir}/%{name}/sigexec|%{_libdir}/%{name}/sigexec|g' \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/vshelper
+%endif
+
 # our libcgroup uses per subsystem mount
 touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss