X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=f3272bfa554844cbd9a0f6db148ba6fae6d99984;hb=2da375cd6e7c82a21e049eeb7d72f3eafa2f859a;hp=9082a80314e376ade8df6885bc8eead526324fb1;hpb=5f14eeb17b00584920fb1ebd74faef5be837df65;p=vserver-reference.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 9082a80..f3272bf 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -102,9 +102,11 @@ EOF
 
 # Prevent all locales from being installed in reference image
 mkdir -p %{installroot}/etc/rpm
-cat > %{installroot}/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-EOF
+(
+echo "%_install_langs en_US:en"
+echo "%_excludedocs 1"
+echo "%__file_context_path /dev/null"
+) > %{installroot}/etc/rpm/macros
 
 # Initialize RPM database in reference image
 mkdir -p %{installroot}/var/lib/rpm
@@ -118,6 +120,9 @@ yum -c ./yum.conf \
 --installroot=%{installroot} \
 -y groupinstall VServer
 
+# Freshen any new RPMs
+find %{_topdir}/RPMS -type f | xargs rpm --root %{installroot} -F
+
 # Clean up /dev in reference image
 MAKEDEV
 
@@ -149,6 +154,22 @@ fi
 chattr -R -i $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
+# Make sure the original user can remove the generated files
+if [ -n "$SUDO_UID" ] ; then
+    chown -R $SUDO_UID.$SUDO_GID .
+    for i in \
+	%{_topdir}/BUILD \
+	%{_topdir}/RPMS/noarch/%{name}-%{version}-%{release}.noarch.rpm \
+	%{_topdir}/RPMS/noarch \
+	%{_topdir}/RPMS/ \
+	%{_topdir}/SRPMS/%{name}-%{version}-%{release}.src.rpm \
+	%{_topdir}/SRPMS/ ; do
+      if [ -e $i ] ; then
+	  chown $SUDO_UID.$SUDO_GID $i
+      fi
+    done
+fi
+
 %post
 # Copy configuration files from host to reference image
 for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do