X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=492cd515fa25d20b2cb62bb9c4ac5aad52ab2225;hb=c740301d8340c2b1b06294899fd7f5833833ccc5;hp=4107547df7726100084c9191d83a1f10a89f3aa3;hpb=59ac117c69e8bc0c915fc3c4e39407ee74decbc2;p=packages%2Futil-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 4107547..492cd51 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -8,7 +8,7 @@ Summary:	Linux virtual server utilities
 Summary(pl):	Narzêdzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
 Version:	0.30.207
-Release:	4
+Release:	5
 License:	GPL
 Group:		Base
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
@@ -26,14 +26,17 @@ Patch0:		%{name}-no-kernel-includes.patch
 Patch1:		%{name}-vsysvwrapper.patch
 Patch2:		%{name}-pld.patch
 Patch3:		%{name}-build-poldek.patch
+Patch4:		%{name}-include.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
 BuildRequires:	beecrypt-devel
-%{?with_dietlibc:BuildRequires:	dietlibc-static >= 0:0.25}
-BuildRequires:	doxygen
+%{?with_dietlibc:BuildRequires:	dietlibc-static >= 2:0.29}
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 1.5.14
 %if %{with doc}
+BuildRequires:	doxygen
+BuildRequires:	graphviz
 BuildRequires:	libxslt-progs
 BuildRequires:	tetex-format-pdflatex
 BuildRequires:	tetex-makeindex
@@ -41,6 +44,7 @@ BuildRequires:	tetex-makeindex
 %endif
 PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-core = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -68,7 +72,7 @@ new_s_context i set_ipv4root.
 Summary:	Development files for Linux vserver libraries
 Summary(pl):	Pliki programistyczne dla bibliotek linuksowego vserwera
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-lib = %{version}-%{release}
 
 %description devel
 This package contains the development files necessary for developing
@@ -265,9 +269,12 @@ NIE INSTALUJ tego pakietu na zwyk
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 install %{SOURCE7} package-menagament.txt
 
+cp -a compat.h vserver-compat.h
+
 %build
 %{__aclocal} -I m4
 %{__automake}
@@ -280,6 +287,7 @@ install %{SOURCE7} package-menagament.txt
 	MOUNT=/bin/mount \
 	PS=/bin/ps \
 	UMOUNT=/bin/umount \
+	IP=/sbin/ip \
 	IPTABLES=/usr/sbin/iptables \
 	MODPROBE=/sbin/modprobe \
 	NAMEIF=/sbin/nameif \
@@ -297,6 +305,8 @@ install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d},/dev/pts}
 %{__make} install install-distribution \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install vserver-compat.h $RPM_BUILD_ROOT%{_includedir}/
+
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 install -d $RPM_BUILD_ROOT/etc/vservices
@@ -432,7 +442,7 @@ fi
 %{?with_doc:%doc lib/apidoc/latex/refman.pdf lib/apidoc/html}
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-%{_includedir}/vserver.h
+%{_includedir}/vserver*.h
 %{_pkgconfigdir}/*.pc
 
 %files static