From 1a95f18e55ed9b53db0cc3feb4eb7051c0130286 Mon Sep 17 00:00:00 2001
From: dsomero <xgizzmo@slackbuilds.org>
Date: Sat, 29 Sep 2012 20:10:33 -0400
Subject: libraries/librtfcomp: Fixed (Don't overwrite /usr/bin/test)

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
---
 libraries/librtfcomp/librtfcomp.SlackBuild | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'libraries/librtfcomp')

diff --git a/libraries/librtfcomp/librtfcomp.SlackBuild b/libraries/librtfcomp/librtfcomp.SlackBuild
index 261fa756d0..aa76e96341 100644
--- a/libraries/librtfcomp/librtfcomp.SlackBuild
+++ b/libraries/librtfcomp/librtfcomp.SlackBuild
@@ -2,17 +2,15 @@
 # Slackware build script for librtfcomp
 # Written by Lionel Young (redtricycle@gmail.com)
 
-PRGNAM=librtfcomp	
+PRGNAM=librtfcomp
 VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -36,7 +34,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -45,7 +43,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-# Permissions
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,7 +50,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Configure
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,15 +61,16 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
 
-# Compile the application and install it into the $PKG directory
 make
 make install DESTDIR=$PKG
 
-# Strip binaries and libraries
+# File /usr/bin/test would be overwritten
+# Per fedora: upstream said that these are not needed
+rm -fr $PKG/usr/bin/
+
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   LICENCE CHANGELOG \
-- 
cgit v1.2.3