- address TMPDIR not wriable issue (usually happens if you use sudo)

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

diff --git a/util-vserver.spec b/util-vserver.spec
index 4e685ce194a52a61727c8a761f6f758a4c8d4397..bfcc551b42bdf025363d0eff1068019c3182a016 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -16,14 +16,14 @@
 %undefine      with_ccache
 #
 Summary:       Linux virtual server utilities
-Summary(pl.UTF-8):   Narzędzia dla linuksowych serwerów wirtualnych
+Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
-Version:       0.30.212
+Version:       0.30.213
 Release:       6
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
-# Source0-md5: 386b91732b7f0f132b4e9d978389dcc2
+# Source0-md5: 2a444e725f7789f751ade259a38553ed
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -82,6 +82,7 @@ Requires:     %{name}-lib = %{version}-%{release}
 Requires:      issue
 Requires:      mktemp >= 1.5-18
 Requires:      rc-scripts
+Requires:      tar
 Requires:      util-linux
 Obsoletes:     util-vserver-core
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -119,7 +120,7 @@ włączonym mechanizmem Linux-Vserver.
 
 %package devel
 Summary:       Development files for Linux vserver libraries
-Summary(pl.UTF-8):   Pliki programistyczne dla bibliotek linuksowego vserwera
+Summary(pl.UTF-8):     Pliki programistyczne dla bibliotek linuksowego vserwera
 Group:         Development/Libraries
 Requires:      %{name}-lib = %{version}-%{release}
 
@@ -133,7 +134,7 @@ programów używających biblioteki vserver.
 
 %package static
 Summary:       Static vserver library
-Summary(pl.UTF-8):   Biblioteka statyczna vservera
+Summary(pl.UTF-8):     Biblioteka statyczna vservera
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
@@ -145,7 +146,7 @@ Ten pakiet zawiera statyczną wersję biblioteki vservera.
 
 %package lib
 Summary:       Dynamic libraries for util-vserver
-Summary(pl.UTF-8):   Biblioteki dynamiczne dla pakietu util-vserver
+Summary(pl.UTF-8):     Biblioteki dynamiczne dla pakietu util-vserver
 Group:         Libraries
 
 %description lib
@@ -170,7 +171,7 @@ podpakiety util-vserver.
 
 %package build
 Summary:       Tools which can be used to build vservers
-Summary(pl.UTF-8):   Narzędzia do budowania vserverów
+Summary(pl.UTF-8):     Narzędzia do budowania vserverów
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
 Requires:      /etc/pld-release
@@ -198,9 +199,9 @@ Ten pakiet zawiera narzędzia pomagające przy budowaniu Vserwerów.
 
 %package -n vserver-distro-fedora
 Summary:       VServer build templates for Fedora Core
-Summary(pl.UTF-8):   Szablony do tworzenia VServerów dla dystrybucji Fedora Core
+Summary(pl.UTF-8):     Szablony do tworzenia VServerów dla dystrybucji Fedora Core
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-build = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -215,9 +216,9 @@ Szablony do tworzenia VServerów dla dystrybucji Fedora Core 1,2,3,4.
 
 %package -n vserver-distro-redhat
 Summary:       VServer build template for Red Hat Linux 9
-Summary(pl.UTF-8):   Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9
+Summary(pl.UTF-8):     Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-build = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -232,9 +233,9 @@ Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9.
 
 %package -n vserver-distro-suse
 Summary:       VServer build template for SuSE 9.1
-Summary(pl.UTF-8):   Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1
+Summary(pl.UTF-8):     Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1
 Group:         Applications/System
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-build = %{version}-%{release}
 Requires:      binutils
 Requires:      e2fsprogs
 Requires:      rpm
@@ -249,9 +250,9 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 
 %package -n vserver-distro-centos
 Summary:       VServer build template for CentOS 4.2
-Summary(pl.UTF-8):   Szablon budowania VServera dla CentOS 4.2
+Summary(pl.UTF-8):     Szablon budowania VServera dla CentOS 4.2
 Group:         Applications/System
-Requires:      util-vserver-build
+Requires:      %{name}-build = %{version}-%{release}
 Requires:      yum
 
 %description -n vserver-distro-centos
@@ -262,9 +263,9 @@ Szablon budowania VServera dla CentOS 4.
 
 %package -n vserver-distro-gentoo
 Summary:       VServer build template for Gentoo
-Summary(pl.UTF-8):   Szablon budowania VServera dla Gentoo
+Summary(pl.UTF-8):     Szablon budowania VServera dla Gentoo
 Group:         Applications/System
-Requires:      util-vserver-build
+Requires:      %{name}-build = %{version}-%{release}
 
 %description -n vserver-distro-gentoo
 VServer build template for Gentoo.
@@ -274,7 +275,7 @@ Szablon budowania VServera dla Gentoo.
 
 %package init
 Summary:       initscripts for vserver
-Summary(pl.UTF-8):   Skrypty inicjalizujące dla vserwera
+Summary(pl.UTF-8):     Skrypty inicjalizujące dla vserwera
 Group:         Applications/System
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name} = %{version}-%{release}
@@ -304,7 +305,7 @@ zatrzymujące Vserwery oraz powiązane narzędzia.
 
 %package legacy
 Summary:       Legacy utilities for util-vserver
-Summary(pl.UTF-8):   Stare narzędzia dla util-vserver
+Summary(pl.UTF-8):     Stare narzędzia dla util-vserver
 Group:         Applications/System
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name} = %{version}-%{release}
@@ -353,7 +354,7 @@ cp -a compat.h vserver-compat.h
 unset LD_SYMBOLIC_FUNCTIONS || :
 
 %if %{with dietlibc}
-CFLAGS="%{rpmcflags} -D__GLIBC__"
+CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 %endif
 %{__aclocal} -I m4
 %{__automake}
@@ -362,8 +363,8 @@ CFLAGS="%{rpmcflags} -D__GLIBC__"
        --with-initrddir=/etc/rc.d/init.d \
        --enable-release \
        --enable-apis=NOLEGACY \
-       %{?with_dietlibc:--enable-dietlibc} \
-       %{!?with_dietlibc:--disable-dietlibc} \
+       --with-initscripts=sysv \
+       --%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \
        MKTEMP=/bin/mktemp \
        MOUNT=/bin/mount \
        PS=/bin/ps \
@@ -388,7 +389,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d,cron.d},/dev/pts} \
        $RPM_BUILD_ROOT{%{_sysconfdir}/vservices,/vservers/.pkg}
 
-%{__make} install install-distribution \
+%{__make} -j1 install install-distribution \
        DESTDIR=$RPM_BUILD_ROOT
 
 cp -a vserver-compat.h $RPM_BUILD_ROOT%{_includedir}
@@ -434,14 +435,42 @@ EOF
 ln -sf null $RPM_BUILD_ROOT/dev/initctl
 
 %ifarch %{x8664}
+# ac i686
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686
+echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpm/platform
+echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac-i686/rpm/platform
+cp -a $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac \
+        $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686
+sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf
+
+# th i686
+cp -a $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th \
+        $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686
+echo "%{_target_cpu}-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/rpm/platform
+echo "i686-%{_target_vendor}-linux" > $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th-i686/rpm/platform
+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
+
+# 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
+sed -i 's/x86_64/amd64/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf
+%endif
+%ifarch i486
+sed -i 's/i486/i386/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf
 %endif
 
-
-# baggins check this: needed but seems unused
+# XXX baggins check this: needed but seems unused
 install -d $RPM_BUILD_ROOT/var/cache/vservers
 
+# we have our own initscript which does the same
+rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
+rm -f $RPM_BUILD_ROOT/usr/lib/util-vserver/vserver-wrapper
+# probaly the part of them
+rm -f $RPM_BUILD_ROOT/etc/vservers.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -534,6 +563,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vnamespace
 %attr(755,root,root) %{_sbindir}/vkill
 %attr(755,root,root) %{_sbindir}/vlimit
+%attr(755,root,root) %{_sbindir}/vdevmap
 %attr(755,root,root) %{_sbindir}/vdu
 %attr(755,root,root) %{_sbindir}/vproc
 %attr(755,root,root) %{_sbindir}/vps
@@ -580,6 +610,7 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/vhashify.cron
 %attr(755,root,root) %{_libdir}/%{name}/vshelper
 %attr(755,root,root) %{_libdir}/%{name}/vshelper-sync
+%attr(755,root,root) %{_libdir}/%{name}/vsysctl
 %{_mandir}/man8/chbind.8*
 %{_mandir}/man8/chcontext.8*
 %{_mandir}/man8/reducecap.8*
@@ -589,7 +620,7 @@ fi
 %{_mandir}/man8/vserver.8*
 %{_mandir}/man8/vtop.8*
 %attr(000,root,root) %dir /vservers
-%attr(755,root,root) %dir /vservers/.pkg
+%dir /vservers/.pkg
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
@@ -632,6 +663,14 @@ fi
 %dir %{_sysconfdir}/vservers/.distributions/pld-ac
 %dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf
+%ifarch %{x8664}
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac-i686/poldek/*.conf
+%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
+%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
@@ -650,6 +689,7 @@ fi
 %{_libdir}/%{name}/defaults/vunify-exclude
 %attr(755,root,root) %{_libdir}/%{name}/pkgmgmt
 %attr(755,root,root) %{_libdir}/%{name}/vapt-get-worker
+%attr(755,root,root) %{_libdir}/%{name}/vclone
 %attr(755,root,root) %{_libdir}/%{name}/vcopy
 %attr(755,root,root) %{_libdir}/%{name}/vpkg
 %attr(755,root,root) %{_libdir}/%{name}/vpoldek-worker
@@ -685,7 +725,7 @@ fi
 
 %files -n vserver-distro-centos
 %defattr(644,root,root,755)
-%{_libdir}/util-vserver/distributions/centos4
+%{_libdir}/util-vserver/distributions/centos*
 
 %files -n vserver-distro-gentoo
 %defattr(644,root,root,755)