- pld-<dist>-i686 templates are back for x86_64 hosts

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 6014064e8c44897bbbcc7410dc058d4f6514ffe8..3f0c40dd470e05fa78621addb116dd461d4bc87f 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -22,7 +22,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:       2.3
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -42,8 +42,10 @@ Source10:    %{name}-initpost.sh
 Source11:      http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_version}.tar.bz2
 # Source11-md5:        1d030717bdbc958ea4b35fd2410dad85
 Source12:      %{name}-vhashify.cron
-Source13:      ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
-# Source13-md5:        08b29584dd349aac9caa7610131a0a88
+Source13:      ftp://ftp.pld-linux.org/dists/ac/PLD-2.0-Ac-GPG-key.asc
+# Source13-md5:        8e7574d1de2fa95c2c54cd2ee03364c1
+Source14:      ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc
+# Source14-md5:        08b29584dd349aac9caa7610131a0a88
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
 Patch4:                %{name}-m4-diet.patch
@@ -334,7 +336,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.
@@ -486,9 +488,40 @@ cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF
 02 2 * * 0      root    %{_libdir}/%{name}/vhashify.cron
 EOF
 
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys
+cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys/pld-ac.asc
+
 install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys
-cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
+cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc
 
+# set arch for pld-ac in pld.conf
+%ifarch i486 i686 ppc sparc alpha athlon
+%define                _ftp_arch       %{_target_cpu}
+%endif
+%ifarch %{x8664}
+%define                _ftp_arch       amd64
+%endif
+%ifarch pentium2 pentium3 pentium4
+%define                _ftp_arch       i686
+%endif
+%ifarch i486
+%define                _ftp_arch       i386
+%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
+
+%ifarch %{x8664}
+# ac i686 for x86_64 hosts
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac \
+        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686
+sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d/pld.conf
+%endif
+
+# set arch for pld-th in pld.conf
 %ifarch i486 i686 ppc sparc alpha athlon
 %define                _ftp_arch       %{_target_cpu}
 %endif
@@ -504,9 +537,41 @@ cp -a %{SOURCE13} $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 %{x8664}
+# th i686 for x86_64 hosts
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th \
+        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686
+sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d/pld.conf
+%endif
+
+# set arch for pld-ti in pld.conf
+%ifarch i486 i686 ppc sparc alpha athlon
+%define                _ftp_arch       %{_target_cpu}
+%endif
+%ifarch %{x8664}
+%define                _ftp_arch       x86_64
+%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-ti/poldek/repos.d/pld.conf
+
+%ifarch %{x8664}
+# titanium i686 for x86_64 hosts
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti \
+        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686
+sed -i 's/%{_ftp_arch}/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/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
@@ -652,12 +717,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
@@ -889,6 +956,20 @@ exit 0
 %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
+%ifarch %{x8664}
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/repos.d/*.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686
+%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek
+%dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/repos.d/*.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/repos.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/repos.d/*.conf
+%endif
 
 %files -n vserver-distro-redhat
 %defattr(644,root,root,755)