From 6da879a7b343a4f1d5ab814321a475ac59cc45e5 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 27 Sep 2014 15:34:23 +0000
Subject: Ensure that install/ files are owned by root

---
 current/glibc/glibc-multilib.SlackBuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'current')

diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index 1b0929b..9957a10 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -466,7 +466,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
   ( cd usr/lib ; strip -g *.a )
 fi
 mkdir install
-cp -a $CWD/slack-desc.glibc-profile install/slack-desc
+cat $CWD/slack-desc.glibc-profile > install/slack-desc
 /sbin/makepkg -l y -c n $TMP/glibc-profile-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
 
 # THIS IS NO LONGER PACKAGED (or is it?  might be better to let it be made, and then ship it or not...)
@@ -481,7 +481,7 @@ if [ "x$LIBDIRSUFFIX" = "x64" ]; then
   mv $PKG/usr/lib/debug usr/lib
 fi
 mkdir install
-cp -a $CWD/slack-desc.glibc-debug install/slack-desc
+cat $CWD/slack-desc.glibc-debug > install/slack-desc
 /sbin/makepkg -l y -c n $TMP/glibc-debug-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
 ## INSTEAD, NUKE THESE LIBS
 #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
@@ -501,7 +501,7 @@ mkdir -p usr/share
 cp -a $PKG/usr/share/i18n usr/share
 cp -a $PKG/usr/share/locale usr/share
 mkdir install
-cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
+cat $CWD/slack-desc.glibc-i18n > install/slack-desc
 /sbin/makepkg -l y -c n $TMP/glibc-i18n-${VERSION}_multilib-$SLACKWARE_ARCH-$BUILD.txz
 
 # glibc-solibs:
@@ -547,8 +547,8 @@ mv sbin/ldconfig .
 rm sbin/*
 mv ldconfig sbin
 mkdir install
-cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
-cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
+cat $CWD/slack-desc.glibc-solibs > install/slack-desc
+cat $CWD/doinst.sh-glibc-solibs > install/doinst.sh
 fix_doinst
 sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
 # Ditch links:
@@ -567,8 +567,8 @@ chmod 755 etc/profile.d/*
 # Ditch links (these are in doinst.sh-glibc):
 find . -type l -exec rm {} \;
 mkdir install
-cp -a $CWD/slack-desc.glibc install/slack-desc
-cp -a $CWD/doinst.sh-glibc install/doinst.sh
+cat $CWD/slack-desc.glibc > install/slack-desc
+cat $CWD/doinst.sh-glibc > install/doinst.sh
 fix_doinst
 sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
 ( cd lib${LIBDIRSUFFIX}
-- 
cgit v1.2.3