- use vsomething

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

diff --git a/util-vserver.spec b/util-vserver.spec
index e3a2c122f1099634eaadb59c807705c39d98793d..7fae038decfef2f64ab49eec308c44f45ed322d0 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -19,7 +19,7 @@ Summary:      Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Version:       0.30.214
-Release:       2
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -41,7 +41,6 @@ Source11:     http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_versi
 Source12:      %{name}-vhashify.cron
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
-Patch2:                %{name}-vrpm.patch
 Patch4:                %{name}-m4-diet.patch
 Patch6:                %{name}-build-umask.patch
 Patch7:                %{name}-utmpx.patch
@@ -175,7 +174,10 @@ Summary(pl.UTF-8): Narzędzia do budowania vserverów
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 Requires:      /etc/pld-release
+# for ar, used by debbootstrap
+Requires:      binutils
 Requires:      e2fsprogs
+Requires:      wget
 Requires:      which
 Conflicts:     poldek < 0.18.8-10
 
@@ -359,7 +361,6 @@ Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
 %setup -q -a11
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch4 -p1
 %patch6 -p1
 %patch7 -p1
@@ -442,6 +443,7 @@ install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost
+install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost
 install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
 install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron
 
@@ -470,6 +472,15 @@ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th \
        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686
 sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf
 
+# titanium i686
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti \
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686
+echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/rpm/platform
+echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti-i686/rpm/platform
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti \
+       $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686
+sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf
+
 # ac x86_64
 sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pkgs/01
 sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpmlist.d/00.lst
@@ -678,10 +689,16 @@ fi
 %dir %{_sysconfdir}/vservers/.distributions/pld-th-i686
 %dir %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th-i686/poldek/*.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti-i686/poldek/*.conf
 %endif
 %dir %{_sysconfdir}/vservers/.distributions/pld-th
 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/*.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti
+%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/*.conf
 %attr(755,root,root) %{_libdir}/%{name}/rpm-fake*
 %dir %{_libdir}/%{name}/distributions
 %attr(-,root,root) %{_libdir}/%{name}/distributions/defaults