X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=ae58f40b3de1ee05ed5fa23922bd088563145fda;hb=d7c4bcba0840ab5fce6b96dae2ba322aba331587;hp=538f3f5d89a0e70ecbb51c79de06932b924a2d9c;hpb=fd71193cf9c796f2f29d5f2072f184d5ad258ad3;p=packages%2Futil-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 538f3f5..ae58f40 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,6 +1,3 @@
-# TODO
-# - reject install in %%pretrans if /proc/virtual/info has incompatible version
-# - make pkgmgmnt internalize modify poldek conf to unignore vserver-packages
 #
 # m68k and mips are the only not supported archs
 #
@@ -14,15 +11,22 @@
 # diet compile fails with ccache in %{__cc}
 %undefine	with_ccache
 #
+%ifarch ppc
+# pdflatex: refman: Invalid argument
+%undefine	with_doc
+%endif
+#
+%define		snap	r2844
+#
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
 Name:		util-vserver
-Version:	0.30.215
-Release:	13
+Version:	0.30.216
+Release:	0.%{snap}.1
 License:	GPL
 Group:		Applications/System
-Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
-# Source0-md5:	befd9b8e5311e87395b67ee381d83649
+Source0:	%{name}-%{version}-%{snap}.tar.bz2
+# Source0-md5:	e7a0b28e935bfce9f6db1dc5d93dc7b5
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -45,6 +49,7 @@ Source14:	ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
 Source15:	%{name}.init
 Patch0:		%{name}-vsysvwrapper.patch
 Patch1:		%{name}-pld.patch
+Patch2:		%{name}-centos.patch
 Patch4:		%{name}-m4-diet.patch
 Patch5:		%{name}-yum-verb-nogpg.patch
 Patch6:		%{name}-build-umask.patch
@@ -59,17 +64,18 @@ Patch14:	%{name}-rpmpath.patch
 Patch15:	%{name}-interfaces-ignore-cvs-dir.patch
 Patch16:	%{name}-personalitymachine.patch
 Patch17:	%{name}-backupfiles.patch
-Patch18:	%{name}-trunk_fixes.patch
-Patch19:	%{name}-vprocunhide-net.patch
-Patch20:	%{name}-more-caps.patch
+Patch18:	%{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch
-Patch21:	%{name}-dbrebuild-internalize4.patch
-Patch22:	%{name}-dev-stdfd.patch
-Patch23:	%{name}-bash-wrapper.patch
+Patch19:	%{name}-dbrebuild-internalize4.patch
+Patch20:	%{name}-dev-stdfd.patch
+Patch21:	%{name}-bash-wrapper.patch
+Patch22:	%{name}-pivot-root-ugly-hack.patch
+Patch23:	%{name}-ac.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
 BuildRequires:	beecrypt-devel
+BuildRequires:	ctags
 %{?with_dietlibc:BuildRequires:	dietlibc-static >= 2:0.29}
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libstdc++-devel
@@ -82,14 +88,20 @@ BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	doxygen
 BuildRequires:	graphviz
 BuildRequires:	libxslt-progs
+BuildRequires:	python-devel
+BuildRequires:	rpm-pythonprov
+%if "%{pld_release}" == "ti"
+BuildRequires:	tetex-fonts-jknappen
 BuildRequires:	tetex-format-pdflatex
 BuildRequires:	tetex-makeindex
-# To be removed when tetex-format-pdflatex, tetex-pdftex...
-# ...and graphviz packages get fixed
-BuildRequires:	ghostscript
-BuildRequires:	ghostscript-fonts-std
-BuildRequires:	tetex-fonts-jknappen
 BuildRequires:	tetex-metafont
+%else
+BuildRequires:	texlive-fonts-type1-urw
+BuildRequires:	texlive-format-pdflatex
+BuildRequires:	texlive-makeindex
+BuildRequires:	texlive-pdftex
+BuildRequires:	texlive-xetex
+%endif
 %{?with_xalan:BuildRequires:	xalan-j}
 %endif
 Requires(post,preun):	/sbin/chkconfig
@@ -103,10 +115,10 @@ Requires:	rc-scripts
 Requires:	tar
 Requires:	util-linux
 Requires:	vserver-distro-pld = %{version}-%{release}
-Conflicts:	poldek < 0.18.8-10
 Obsoletes:	util-vserver-build
 Obsoletes:	util-vserver-core
 Obsoletes:	util-vserver-init
+Conflicts:	poldek < 0.18.8-10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with dietlibc}
@@ -131,8 +143,8 @@ set_ipv4root system call.
 
 This package contains utilities which are required to communicate with
 the Linux-Vserver enabled kernel, utilities which assist in building
-Vservers and SysV initscripts which start and stop Vservers and related
-tools.
+Vservers and SysV initscripts which start and stop Vservers and
+related tools.
 
 %description -l pl.UTF-8
 Ten pakiet dostarcza składniki i szkielet do tworzenia wirtualnych
@@ -228,6 +240,18 @@ w interakcję z innymi ani z usługami na głównym serwerze.
 Ten pakiet zawiera narzędzia potrzebne do pracy z Vserwerami mającymi
 konfigurację w starym stylu.
 
+%package -n python-util-vserver
+Summary:	Python interface to libutil-vserver library
+Summary(pl.UTF-8):	Pythonowy interfejs do biblioteki libutil-vserver
+License:	LGPL v2.1+
+Group:		Libraries/Python
+
+%description -n python-util-vserver
+Python interface to libutil-vserver library.
+
+%description -n python-util-vserver -l pl.UTF-8
+Pythonowy interfejs do biblioteki libutil-vserver.
+
 %package -n vserver-distro-alpine
 Summary:	VServer build template for Alpine Linux
 Summary(pl.UTF-8):	Szablon budowania VServerów dla dystrybucji Alpine Linux
@@ -245,6 +269,7 @@ Summary:	VServer build template for CentOS
 Summary(pl.UTF-8):	Szablon budowania VServerów dla dystrybucji CentOS
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
+Requires:	vserver-distro-redhat = %{version}-%{release}
 Requires:	yum
 
 %description -n vserver-distro-centos
@@ -254,11 +279,13 @@ VServer build template for CentOS 4.2 and 5.
 Szablon budowania VServerów dla dystrybucji CentOS 4.2 i 5.
 
 %package -n vserver-distro-debian
-Summary:	VServer build templates for Debian
-Summary(pl.UTF-8):	Szablony do tworzenia VServerów dla dystrybucji Debian
+Summary:	VServer build templates for Debian and Ubuntu
+Summary(pl.UTF-8):	Szablony do tworzenia VServerów dla dystrybucji Debian i Ubuntu
 Group:		Applications/System
 Requires:	%{name} = %{version}-%{release}
+Requires:	debootstrap
 Requires:	dpkg
+Obsoletes:	vserver-distro-ubuntu
 
 %description -n vserver-distro-debian
 VServer build templates for Debian.
@@ -275,6 +302,7 @@ Requires:	binutils
 Requires:	e2fsprogs
 Requires:	rpm
 Requires:	wget
+Requires:	vserver-distro-redhat = %{version}-%{release}
 Requires:	yum
 
 %description -n vserver-distro-fedora
@@ -342,23 +370,11 @@ VServer build template for SuSE Linux 9.1.
 %description -n vserver-distro-suse -l pl.UTF-8
 Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 
-%package -n vserver-distro-ubuntu
-Summary:	VServer build templates for Ubuntu
-Summary(pl.UTF-8):	Szablony do tworzenia VServerów dla dystrybucji Ubuntu
-Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
-Requires:	dpkg
-
-%description -n vserver-distro-ubuntu
-VServer build templates for Ubuntu.
-
-%description -n vserver-distro-ubuntu -l pl.UTF-8
-Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
-
 %prep
-%setup -q -a11
+%setup -q -n %{name}-%{version}-%{snap} -a11
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -378,7 +394,7 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p1
+%patch23 -p0
 
 install %{SOURCE9} package-management.txt
 
@@ -721,6 +737,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/chcontext-compat
 %attr(755,root,root) %{_libdir}/%{name}/check-unixfile
 %attr(755,root,root) %{_libdir}/%{name}/chroot-sh
+%attr(755,root,root) %{_libdir}/%{name}/exec-remount
 %attr(755,root,root) %{_libdir}/%{name}/exec-ulimit
 %attr(755,root,root) %{_libdir}/%{name}/fakerunlevel
 %attr(755,root,root) %{_libdir}/%{name}/filetime
@@ -807,6 +824,10 @@ exit 0
 %{_mandir}/man8/rebootmgr.8*
 %{_mandir}/man8/vserver-copy.8*
 
+%files -n python-util-vserver
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/_libvserver.so
+
 %files -n vserver-distro-alpine
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/distributions/alpine
@@ -820,7 +841,6 @@ exit 0
 %files -n vserver-distro-debian
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/distributions/debian
-%{_libdir}/%{name}/distributions/debian/debootstrap.script
 %attr(755,root,root) %{_libdir}/%{name}/distributions/debian/initpost
 %{_libdir}/%{name}/distributions/etch
 %{_libdir}/%{name}/distributions/lenny
@@ -836,7 +856,15 @@ exit 0
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/fc*/apt/sources.list
 %{_libdir}/%{name}/distributions/f7
 %{_libdir}/%{name}/distributions/f8
-%{_libdir}/%{name}/distributions/fc*
+%{_libdir}/%{name}/distributions/f9
+%{_libdir}/%{name}/distributions/f10
+%{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/fc1
+%{_libdir}/%{name}/distributions/fc2
+%{_libdir}/%{name}/distributions/fc3
+%{_libdir}/%{name}/distributions/fc4
+%{_libdir}/%{name}/distributions/fc5
+%{_libdir}/%{name}/distributions/fc6
 
 %files -n vserver-distro-gentoo
 %defattr(644,root,root,755)
@@ -873,10 +901,15 @@ exit 0
 
 %files -n vserver-distro-redhat
 %defattr(644,root,root,755)
-%dir %{_sysconfdir}/vservers/.distributions/rh*
-%dir %{_sysconfdir}/vservers/.distributions/rh*/apt
+%dir %{_sysconfdir}/vservers/.distributions/rh9
+%dir %{_sysconfdir}/vservers/.distributions/rh9/apt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/rh*/apt/sources.list
-%{_libdir}/%{name}/distributions/rh*
+%{_libdir}/%{name}/distributions/rh9
+%dir %{_libdir}/%{name}/distributions/redhat
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initctl
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpost
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpre
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/rc.sysinit
 
 %files -n vserver-distro-suse
 %defattr(644,root,root,755)
@@ -884,13 +917,3 @@ exit 0
 %dir %{_sysconfdir}/vservers/.distributions/suse*/apt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/suse*/apt/sources.list
 %{_libdir}/%{name}/distributions/suse*
-
-%files -n vserver-distro-ubuntu
-%defattr(644,root,root,755)
-%{_libdir}/%{name}/distributions/breezy
-%{_libdir}/%{name}/distributions/dapper
-%{_libdir}/%{name}/distributions/edgy
-%{_libdir}/%{name}/distributions/feisty
-%{_libdir}/%{name}/distributions/gutsy
-%{_libdir}/%{name}/distributions/hoary
-%{_libdir}/%{name}/distributions/warty