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

diff --git a/util-vserver.spec b/util-vserver.spec
index 2911912..e5bde56 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,3 +1,5 @@
+# TODO
+# - %install is not re-entrant
 #
 # m68k and mips are the only not supported archs
 #
@@ -6,7 +8,7 @@
 %bcond_without	doc			# don't build documentation which needed LaTeX
 %bcond_without	no_dynamic_context	# disable enforcement of disabled dynamic context
 %bcond_with	xalan			# use the xalan xslt processor
-#
+
 %define	vproc_version 0.01
 # diet compile fails with ccache in %{__cc}
 %undefine	with_ccache
@@ -16,18 +18,17 @@
 %undefine	with_doc
 %endif
 
-#
-%define	snap pre2841
+%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}.4
+Release:	1.%{snap}.%{rel}
 License:	GPL
 Group:		Applications/System
-#Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
 Source0:	http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	71c3f2012d0159aac22fee098be063e9
+# Source0-md5:	236c0ef54b94f8c116afaf7b78396a58
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -68,10 +69,11 @@ Patch17:	%{name}-backupfiles.patch
 Patch18:	%{name}-vprocunhide-net.patch
 # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.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
+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
@@ -81,21 +83,32 @@ BuildRequires:	ctags
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 1.5.14
-%ifarch %{x8664}
-BuildRequires:	sed >= 4.0
-%endif
+BuildRequires:	pkgconfig
+BuildRequires:	python-devel
+BuildRequires:	python-modules
+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
-BuildRequires:	rpm-pythonprov
+%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
 BuildRequires:	texlive-xetex
+%endif
 %{?with_xalan:BuildRequires:	xalan-j}
 %endif
 Requires(post,preun):	/sbin/chkconfig
@@ -105,14 +118,13 @@ 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
 Obsoletes:	util-vserver-init
-Obsoletes:	vserver-distro-ubuntu
 Conflicts:	poldek < 0.18.8-10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -264,6 +276,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
@@ -273,17 +286,20 @@ 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
+Provides:	vserver-distro-ubuntu
+Obsoletes:	vserver-distro-ubuntu
 
 %description -n vserver-distro-debian
-VServer build templates for Debian.
+VServer build templates for Debian and Ubuntu.
 
 %description -n vserver-distro-debian -l pl.UTF-8
-Szablony do tworzenia VServerów dla dystrybucji Debian.
+Szablony do tworzenia VServerów dla dystrybucji Debian i Ubuntu.
 
 %package -n vserver-distro-fedora
 Summary:	VServer build templates for Fedora
@@ -293,6 +309,7 @@ Requires:	%{name} = %{version}-%{release}
 Requires:	binutils
 Requires:	e2fsprogs
 Requires:	rpm
+Requires:	vserver-distro-redhat = %{version}-%{release}
 Requires:	wget
 Requires:	yum
 
@@ -362,8 +379,7 @@ VServer build template for SuSE Linux 9.1.
 Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 
 %prep
-%setup -q -a11 -n %{name}-%{version}-%{snap}
-#%setup -q -a11
+%setup -q -n %{name}-%{version}-%{snap} -a11
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -383,10 +399,11 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
-%patch20 -p1
 %patch21 -p1
 %patch22 -p1
-%patch23 -p0
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -406,17 +423,23 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 	--enable-apis=NOLEGACY \
 	--with-initscripts=sysv \
 	--%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
-	MKTEMP=/bin/mktemp \
-	MOUNT=/bin/mount \
-	PS=/bin/ps \
-	UMOUNT=/bin/umount \
+	FSCK=/sbin/fsck \
+	IONICE=%{_usrbin}/ionice \
 	IP=/sbin/ip \
 	IPTABLES=%{_usrsbin}/iptables \
+	MKTEMP=/bin/mktemp \
 	MODPROBE=/sbin/modprobe \
+	MOUNT=/bin/mount \
 	NAMEIF=/sbin/nameif \
+	PS=/bin/ps \
+	RESTORE=/sbin/restore \
 	RMMOD=/sbin/rmmod \
+	RSYNC=%{_usrbin}/rsync \
+	STRACE=%{_usrbin}/strace \
+	UMOUNT=/bin/umount \
 	VCONFIG=/sbin/vconfig \
 	WGET=%{_usrbin}/wget \
+# end
 
 %{__make} all
 %{?with_doc:%{__make} doc}
@@ -437,7 +460,7 @@ install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
-	s=`basename $i | sed s/v_//`
+	s=$(basename $i | sed s/v_//)
 	cat >$RPM_BUILD_ROOT%{_sysconfdir}/vservices/$s << EOF
 # IP addresses/interfaces to bound $s service to
 #IP=10.0.0.1
@@ -472,7 +495,8 @@ ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/ini
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
 %endif
 install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
-install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+sed -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
+chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
 cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
@@ -540,8 +564,10 @@ echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_al
 
 install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek
 
-# we have our own initscript which does the same
+# cleanups
 rm -rf $RPM_BUILD_ROOT/dev
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/_libvserver.la
+# we have our own initscript which does the same
 rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper
 rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-init.functions
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
@@ -638,8 +664,8 @@ exit 0
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt
-%doc contrib/yum*.patch package-management.txt
+%doc AUTHORS NEWS THANKS doc/intro.txt
+%doc package-management.txt
 %{?with_doc:%doc doc/*.html}
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers
@@ -717,7 +743,6 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpost
 %attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpre
 %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
@@ -820,6 +845,7 @@ exit 0
 %files -n python-util-vserver
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/_libvserver.so
+%{py_sitedir}/libvserver.py
 
 %files -n vserver-distro-alpine
 %defattr(644,root,root,755)
@@ -835,9 +861,10 @@ exit 0
 %defattr(644,root,root,755)
 %dir %{_libdir}/%{name}/distributions/debian
 %attr(755,root,root) %{_libdir}/%{name}/distributions/debian/initpost
-%{_libdir}/%{name}/distributions%{_sysconfdir}h
+%{_libdir}/%{name}/distributions/etch
 %{_libdir}/%{name}/distributions/lenny
 %{_libdir}/%{name}/distributions/sid
+%{_libdir}/%{name}/distributions/squeeze
 
 %files -n vserver-distro-fedora
 %defattr(644,root,root,755)
@@ -847,7 +874,20 @@ exit 0
 %dir %{_sysconfdir}/vservers/.distributions/fc*
 %dir %{_sysconfdir}/vservers/.distributions/fc*/apt
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/fc*/apt/sources.list
-%{_libdir}/%{name}/distributions/f*
+%{_libdir}/%{name}/distributions/f7
+%{_libdir}/%{name}/distributions/f8
+%{_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
+%{_libdir}/%{name}/distributions/fc4
+%{_libdir}/%{name}/distributions/fc5
+%{_libdir}/%{name}/distributions/fc6
 
 %files -n vserver-distro-gentoo
 %defattr(644,root,root,755)
@@ -884,10 +924,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)