- few fixes from trunk version of util-vserver, helps for

[packages/util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index 71cf8c46554092461a18a3b7da3371f580351816..50ed8cccc1aa8e147a9999373ca3d1f26cf483b6 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,7 +1,5 @@
 # TODO
-# - somewhy empty /var/cache/vservers is needed when building pld vserver
 # - make build create /dev/std{in,out,err} links
-# - f8 subpackage
 # - reject install in %%pretrans if /proc/virtual/info has incompatible version
 # - unpackaged
 #   /etc/rc.d/init.d/util-vserver -- # integrate to our initscript (util-vserver sets the path to vshelper and kills all guest processes)
@@ -22,7 +20,7 @@ Summary:      Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.215
-Release:       2
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -60,6 +58,7 @@ Patch13:      %{name}-tmpdir.patch
 Patch14:       %{name}-rpmpath.patch
 Patch15:       %{name}-interfaces-ignore-cvs-dir.patch
 Patch16:       %{name}-personalitymachine.patch
+Patch17:       %{name}-backupfiles.patch
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
@@ -336,7 +335,7 @@ Summary(pl.UTF-8):  Szablony do tworzenia VServerów dla dystrybucji PLD Linux
 Group:         Applications/System
 Requires:      %{name}-build = %{version}-%{release}
 Requires:      /etc/pld-release
-Requires:      poldek >= 0.30-0.20080225.00.1
+Requires:      poldek >= 0.30
 
 %description -n vserver-distro-pld
 VServer build templates for PLD Linux.
@@ -405,6 +404,7 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 install %{SOURCE9} package-management.txt
 
@@ -480,7 +480,9 @@ install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/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}
 install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
@@ -494,6 +496,25 @@ cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
 
+# set arch for pld-ac in pld.conf
+%ifarch i586 i686 ppc sparc alpha athlon
+%define                _ftp_arch       %{_target_cpu}
+%endif
+%ifarch %{x8664}
+%define                _ftp_arch       amd64
+%endif
+%ifarch i486
+%define                _ftp_arch       i386
+%endif
+%ifarch pentium2 pentium3 pentium4
+%define                _ftp_arch       i686
+%endif
+%ifarch sparcv9 sparc64
+%define                _ftp_arch       sparc
+%endif
+%{__sed} -i -e 's|%%ARCH%%|%{_ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/repos.d/pld.conf
+
+# set arch for pld-th in pld.conf
 %ifarch i486 i686 ppc sparc alpha athlon
 %define                _ftp_arch       %{_target_cpu}
 %endif
@@ -509,9 +530,22 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
 %ifarch sparcv9 sparc64
 %define                _ftp_arch       sparc
 %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
+%define                _ftp_arch       %{_target_cpu}
+%endif
+%ifarch %{x8664}
+%define                _ftp_arch       x86_64
+%endif
+%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
+
 cat <<'EOF' > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/defaults/rpm/platform
 # first platform file entry can't contain regexps
 %{_target_cpu}-%{_target_vendor}-linux
@@ -594,8 +628,7 @@ sparc-[^-]*-linux(-gnu)?
 noarch-[^-]*-.*
 EOF
 
-# XXX baggins check this: needed but seems unused
-install -d $RPM_BUILD_ROOT/var/cache/vservers
+install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek
 
 # we have our own initscript which does the same
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
@@ -657,12 +690,14 @@ if [ "$1" = "0" ]; then
 fi
 
 %triggerpostun -n vserver-distro-pld -- util-vserver-build < 0.30.215-1.1
-D=%{_sysconfdir}/vservers/.distributions/pld-th/poldek
+for D in ac th ti; do
+       P=%{_sysconfdir}/vservers/.distributions/pld-$D/poldek
 
-if [ -f $D/pld-source.conf.rpmsave ]; then
-       cp -f $D/repos.d/pld.conf{,.rpmnew}
-       mv -f $D/pld-source.conf.rpmsave $D/repos.d/pld.conf
-fi
+       if [ -f $P/pld-source.conf.rpmsave ]; then
+               cp -f $P/repos.d/pld.conf{,.rpmnew}
+               mv -f $P/pld-source.conf.rpmsave $P/repos.d/pld.conf
+       fi
+done
 exit 0
 
 %files
@@ -674,6 +709,7 @@ exit 0
 %dir %{_sysconfdir}/vservers/.defaults/apps
 %dir %{_sysconfdir}/vservers/.defaults/files
 %{_sysconfdir}/vservers/.defaults/vdirbase
+%{_sysconfdir}/vservers/.defaults/cachebase
 %{_sysconfdir}/vservers/.defaults/run.rev
 /sbin/vshelper
 %attr(755,root,root) %{_sbindir}/chbind
@@ -760,6 +796,7 @@ exit 0
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
 %dir /var/cache/vservers
+%dir /var/cache/vservers/poldek
 
 %files lib
 %defattr(644,root,root,755)
@@ -890,10 +927,12 @@ 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)