- 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 4d562566ab5bdb7693518b675a7c1b2c50e99f5c..bfcc551b42bdf025363d0eff1068019c3182a016 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.213
-Release:       2
+Release:       6
 License:       GPL
 Group:         Applications/System
 Source0:       http://ftp.linux-vserver.org/pub/utils/util-vserver/%{name}-%{version}.tar.bz2
@@ -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)
@@ -353,7 +354,7 @@ cp -a compat.h vserver-compat.h
 unset LD_SYMBOLIC_FUNCTIONS || :
 
 %if %{with dietlibc}
-CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1"
+CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__"
 %endif
 %{__aclocal} -I m4
 %{__automake}
@@ -437,6 +438,8 @@ ln -sf null $RPM_BUILD_ROOT/dev/initctl
 # 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
@@ -444,6 +447,8 @@ sed -i 's/x86_64/i686/g' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/p
 # 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