X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=92bae57b9e524edbe6f5c9e7350687a9368164ab;hb=658d1adac0d6d48b818749fc3b8088f15d317db4;hp=5af4e6c8d7b0ce5daf2f72108b8005184b9ca91c;hpb=888b86658474835a68e1b4d3441f943ec6dae5bd;p=packages%2Futil-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 5af4e6c..92bae57 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,8 +18,8 @@
 %undefine	with_doc
 %endif
 
-%define		snap	pre2926
-%define		rel	3
+%define		snap	pre3000
+%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:	236c0ef54b94f8c116afaf7b78396a58
+# Source0-md5:	ae2e90be62a84513074a649fe8594036
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -52,6 +52,7 @@ Source15:	%{name}.init
 Patch0:		%{name}-vsysvwrapper.patch
 Patch1:		%{name}-pld.patch
 Patch2:		%{name}-centos.patch
+Patch3:		%{name}-tld.patch
 Patch4:		%{name}-m4-diet.patch
 Patch5:		%{name}-yum-verb-nogpg.patch
 Patch6:		%{name}-build-umask.patch
@@ -73,7 +74,6 @@ 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
@@ -90,7 +90,7 @@ 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
@@ -103,6 +103,7 @@ BuildRequires:	tetex-metafont
 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
@@ -377,11 +378,43 @@ 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-scientificlinux
+Summary:	VServer build template for Scientific Linux
+Summary(pl.UTF-8):	Szablon do tworzenia VServerów dla dystrybucji Scientific Linux
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	binutils
+Requires:	e2fsprogs
+Requires:	rpm
+Requires:	wget
+Requires:	yum
+
+%description -n vserver-distro-scientificlinux
+VServer build template for Scientific Linux.
+
+%description -n vserver-distro-scientificlinux -l pl.UTF-8
+Szablon do tworzenia VServerów dla dystrybucji Scientific Linux.
+
+%package -n vserver-distro-tld
+Summary:	VServer build templates for Titanium Linux Distribution
+Summary(pl.UTF-8):	Szablony do tworzenia VServerów dla dystrybucji Titanium Linux
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+Requires:	/etc/tld-release
+Requires:	poldek >= 0.30
+
+%description -n vserver-distro-tld
+VServer build templates for Titanium Linux Distribution.
+
+%description -n vserver-distro-tld -l pl.UTF-8
+Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
+
 %prep
 %setup -q -n %{name}-%{version}-%{snap} -a11
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -402,7 +435,6 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 %patch22 -p1
 %patch24 -p1
 %patch25 -p1
-%patch26 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -451,11 +483,14 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/vservices \
-	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/apps/vdevmap
+	$RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/{apps/vdevmap,cgroup}
 
 %{__make} -j1 install install-distribution \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# our libcgroup uses per subsystem mount
+touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss
+
 chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/*
 
 for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do
@@ -488,11 +523,9 @@ install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/initpost
+install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/tld/initpost
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
 ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost
-%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
-ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
-%endif
 install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
 sed -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
@@ -543,9 +576,8 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %endif
 %{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf
 
-%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
-# set arch for pld-ti in pld.conf
-%ifarch i586 i686
+# set arch for tld in tld.conf
+%ifarch i586 i686 ppc sparc alpha
 %define		ftp_arch	%{_target_cpu}
 %endif
 %ifarch %{x8664}
@@ -554,8 +586,7 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %ifarch athlon pentium2 pentium3 pentium4
 %define		ftp_arch	i686
 %endif
-%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf
-%endif
+%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d/tld.conf
 
 # current debootstrap link
 echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_all.deb" \
@@ -679,6 +710,8 @@ exit 0
 %dir %{_sysconfdir}/vservers/.defaults/apps/vdevmap
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify/hash
+%dir %{_sysconfdir}/vservers/.defaults/cgroup
+%{_sysconfdir}/vservers/.defaults/cgroup/per-ss
 %dir %{_sysconfdir}/vservers/.defaults/files
 %{_sysconfdir}/vservers/.defaults/vdirbase
 %{_sysconfdir}/vservers/.defaults/cachebase
@@ -724,6 +757,7 @@ exit 0
 %attr(755,root,root) %{_sbindir}/vtag
 %attr(755,root,root) %{_sbindir}/vtop
 %attr(755,root,root) %{_sbindir}/vuname
+%attr(755,root,root) %{_sbindir}/vurpm
 %attr(755,root,root) %{_sbindir}/vwait
 %attr(755,root,root) %{_sbindir}/vyum
 %dir %{_libdir}/%{name}
@@ -782,6 +816,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/%{name}/vprocunhide
 %attr(755,root,root) %{_libdir}/%{name}/vrpm-*
 %attr(755,root,root) %{_libdir}/%{name}/vserver-build
+%attr(755,root,root) %{_libdir}/%{name}/vurpm-worker
 %{_libdir}/%{name}/vserver-build.*
 %{_libdir}/%{name}/vserver-setup.functions
 %{_libdir}/%{name}/vserver.*
@@ -864,6 +899,7 @@ exit 0
 %{_libdir}/%{name}/distributions/lenny
 %{_libdir}/%{name}/distributions/sid
 %{_libdir}/%{name}/distributions/squeeze
+%{_libdir}/%{name}/distributions/wheezy
 
 %files -n vserver-distro-fedora
 %defattr(644,root,root,755)
@@ -880,6 +916,7 @@ exit 0
 %{_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
@@ -913,12 +950,6 @@ exit 0
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/*.conf
-%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek
-%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/*.conf
-%endif
 
 %files -n vserver-distro-redhat
 %defattr(644,root,root,755)
@@ -938,3 +969,23 @@ 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-scientificlinux
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/distributions/sl6
+%attr(755,root,root) %{_libdir}/%{name}/distributions/sl6/initpost
+%attr(755,root,root) %{_libdir}/%{name}/distributions/sl6/initpre
+%{_libdir}/%{name}/distributions/sl6/pkgs
+%{_libdir}/%{name}/distributions/sl6/yum
+%{_libdir}/%{name}/distributions/sl6/yum.repos.d
+
+%files -n vserver-distro-tld
+%defattr(644,root,root,755)
+%dir %{_libdir}/%{name}/distributions/tld
+%attr(755,root,root) %{_libdir}/%{name}/distributions/tld/initpost
+%{_libdir}/%{name}/distributions/tld/pkgs
+%{_libdir}/%{name}/distributions/tld/rpm
+%dir %{_sysconfdir}/vservers/.distributions/tld
+%dir %{_sysconfdir}/vservers/.distributions/tld/poldek
+%dir %{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d/*.conf