X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=e5bde5688ece01d8ce520bb6bf41f91a05190f21;hb=c27aa3955e3a213225889c564fa919f40746123e;hp=c9cef927a83d5a38c542e4748f2a96f8bed4dff4;hpb=8524db8aac647f47b5bba6e3e685d32b0829cbd3;p=packages%2Futil-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index c9cef92..e5bde56 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,17 +18,17 @@
 %undefine	with_doc
 %endif
 
-%define		snap	pre2883
-%define		rel		1
+%define		snap	pre2926
+%define		rel	6
 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}.%{rel}
+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:	4f7a64b7295ea01673974394f4afd3ff
+# Source0-md5:	236c0ef54b94f8c116afaf7b78396a58
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -72,6 +72,8 @@ Patch19:	%{name}-dbrebuild-internalize4.patch
 Patch21:	%{name}-bash-wrapper.patch
 Patch22:	%{name}-pivot-root-ugly-hack.patch
 Patch24:	vunify-more-exclude.patch
+Patch25:	stat.patch
+Patch26:	%{name}-usersystime.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -88,18 +90,20 @@ BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 %if %{with doc}
-BuildRequires:	doxygen
+BuildRequires:	doxygen >= 1:1.7.3
 BuildRequires:	graphviz
 BuildRequires:	libxslt-progs
 BuildRequires:	python-devel
-%if "%{pld_release}" == "ti"
+%if "%{pld_release}" != "th"
 BuildRequires:	tetex-fonts-jknappen
 BuildRequires:	tetex-format-pdflatex
 BuildRequires:	tetex-makeindex
 BuildRequires:	tetex-metafont
 %else
+BuildRequires:	texlive-fonts-rsfs
 BuildRequires:	texlive-fonts-type1-urw
 BuildRequires:	texlive-format-pdflatex
+BuildRequires:	texlive-latex-extend
 BuildRequires:	texlive-latex-ucs
 BuildRequires:	texlive-makeindex
 BuildRequires:	texlive-pdftex
@@ -114,9 +118,9 @@ Requires:	diffutils
 Requires:	issue
 Requires:	make
 Requires:	mktemp >= 1.5-18
-Requires:	rc-scripts
+Requires:	rc-scripts >= 0.4.3.4
 Requires:	tar
-Requires:	util-linux
+Requires:	util-linux >= 2.13
 Requires:	vserver-distro-pld = %{version}-%{release}
 Obsoletes:	util-vserver-build
 Obsoletes:	util-vserver-core
@@ -398,6 +402,8 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch21 -p1
 %patch22 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -873,6 +879,9 @@ exit 0
 %{_libdir}/%{name}/distributions/f9
 %{_libdir}/%{name}/distributions/f10
 %{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/f12
+%{_libdir}/%{name}/distributions/f13
+%{_libdir}/%{name}/distributions/f14
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3