From 1e07a54b6e65053733b3509b13a4ec800139abb4 Mon Sep 17 00:00:00 2001 From: hawk Date: Tue, 18 Oct 2011 06:45:32 +0000 Subject: [PATCH] - Titanium is no longer part of PLD, moved to separate patch and separate subpackage Changed files: util-vserver-pld.patch -> 1.45 util-vserver.spec -> 1.285 --- util-vserver-pld.patch | 77 +++--------------------------------------- util-vserver.spec | 45 ++++++++++++++++-------- 2 files changed, 35 insertions(+), 87 deletions(-) diff --git a/util-vserver-pld.patch b/util-vserver-pld.patch index 199bab2..ae58481 100644 --- a/util-vserver-pld.patch +++ b/util-vserver-pld.patch @@ -22,27 +22,25 @@ template/initpost template/initpre \ rh9/apt/rpmpriorities rh9/pkgs/01 rh9/pkgs/02 \ fc1/apt/rpmpriorities fc1/pkgs/01 fc1/pkgs/02 \ -@@ -85,7 +86,10 @@ +@@ -85,7 +86,9 @@ suse91/apt/rpmpriorities suse91/pkgs/01 suse91/pkgs/02 \ suse91/rpm/macros \ gentoo/init-vserver.sh gentoo/net.vserver \ - gentoo/reboot.sh gentoo/shutdown.sh + gentoo/reboot.sh gentoo/shutdown.sh\ + pld-ac/pkgs/01 pld-ac/rpm/macros \ -+ pld-th/pkgs/01 pld-th/rpm/macros \ -+ pld-ti/pkgs/01 pld-ti/rpm/macros ++ pld-th/pkgs/01 pld-th/rpm/macros nobase_confdistrib_DATA = rh9/apt/sources.list \ fc1/apt/sources.list \ -@@ -95,7 +99,10 @@ +@@ -95,7 +99,9 @@ fc5/apt/sources.list \ fc6/apt/sources.list \ f7/apt/sources.list \ - suse91/apt/sources.list + suse91/apt/sources.list \ + pld-ac/poldek/repos.d/pld.conf \ -+ pld-th/poldek/repos.d/pld.conf \ -+ pld-ti/poldek/repos.d/pld.conf ++ pld-th/poldek/repos.d/pld.conf AM_INSTALLCHECK_STD_OPTIONS_EXEMPT \ = $(nobase_distrib_SCRIPTS) @@ -223,73 +221,6 @@ +%_netsharedpath /dev:/proc +%_tmppath /tmp +%_host_os %_os ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/pkgs/01 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ti/pkgs/01 2009-06-22 17:48:26.000000000 +0200 -@@ -0,0 +1,6 @@ -+basesystem -+filesystem -+glibc-misc -+issue -+rpm-base -+vserver-packages ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/poldek/repos.d/pld.conf 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ti/poldek/repos.d/pld.conf 2009-06-22 17:48:26.000000000 +0200 -@@ -0,0 +1,46 @@ -+# PLD Titanium -+# Unofficial version of PLD Linux Distribution -+# http://www.pld-linux.org/Titanium -+ -+_arch = %ARCH% -+_prefix = ftp://ftp.titanium.pld-linux.org/branches/titanium -+ -+_type = pndir -+ -+[source] -+type = %{_type} -+name = titanium -+path = %{_prefix}/PLD/%{_arch}/RPMS/ -+ -+[source] -+type = %{_type} -+name = titanium -+path = %{_prefix}/PLD/noarch/RPMS/ -+ -+[source] -+type = %{_type} -+name = titanium-ready -+path = %{_prefix}/ready/%{_arch}/RPMS/ -+auto = no -+autoup = no -+ -+[source] -+type = %{_type} -+name = titanium-ready -+path = %{_prefix}/ready/noarch/RPMS/ -+auto = no -+autoup = no -+ -+[source] -+type = %{_type} -+name = titanium-test -+path = %{_prefix}/test/%{_arch}/RPMS/ -+auto = no -+autoup = no -+ -+[source] -+type = %{_type} -+name = titanium-test -+path = %{_prefix}/test/noarch/RPMS/ -+auto = no -+autoup = no ---- util-vserver-0.30.216-r2837.orig/distrib/pld-ti/rpm/macros 1970-01-01 01:00:00.000000000 +0100 -+++ util-vserver-0.30.216-r2837/distrib/pld-ti/rpm/macros 2009-06-22 17:48:26.000000000 +0200 -@@ -0,0 +1,6 @@ -+# Because of https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52725 -+# you have to use at least one language beside 'C' -+%_install_langs C:en:pl -+%_netsharedpath /dev:/proc -+%_tmppath /tmp -+%_host_os %_os --- util-vserver-0.30.216-r2837.orig/scripts/functions 2009-06-22 17:36:35.000000000 +0200 +++ util-vserver-0.30.216-r2837/scripts/functions 2009-06-22 17:48:26.000000000 +0200 @@ -403,6 +403,20 @@ diff --git a/util-vserver.spec b/util-vserver.spec index eba11f0..92daa9e 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -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 @@ -394,11 +395,26 @@ 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 @@ -507,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 @@ -562,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} @@ -573,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" \ @@ -938,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) @@ -971,3 +977,14 @@ exit 0 %attr(755,root,root) %{_libdir}/%{name}/distributions/sl6/initpre %{_libdir}/%{name}/distributions/sl6/pkgs %{_libdir}/%{name}/distributions/sl6/yum + +%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 -- 2.44.0