Update to 2.2.0 and some script rework

1 files changed, 18 insertions, 14 deletions

diff --git a/libgphoto2/build/libgphoto2.SlackBuild b/libgphoto2/build/libgphoto2.SlackBuild
index 67112b10..b6edc64b 100755
--- a/libgphoto2/build/libgphoto2.SlackBuild
+++ b/libgphoto2/build/libgphoto2.SlackBuild
@@ -11,6 +11,11 @@
 # Changelog:
 # 2.1.6-1:   27/Sep/2005 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 2.2.0-1:   19/jun/2006 by Eric Hameleers <alien@slackware.com>
+#            * Update.
+#              The compilation needs installed header files to make it run
+#              errorfree. So, I installed the package and re-ran the build.
+#              I love circular cependencies.
 # 
 # Run 'sh SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -26,19 +31,19 @@ if [ "$TMP" = "" ]; then
 fi
 
 PRGNAM=libgphoto2
-VERSION=2.1.6
+VERSION=2.2.0
 ARCH=${ARCH:-i486}
 BUILD=1
 
-DOCS="AUTHORS BUGS ChangeLog* COPYING CREDITS FAQ GPL* LICENSE MAINTAINERS \
-      NEWS README* TODO"
+DOCS="ABOUT-NLS AUTHORS CHANGES COPYING ChangeLog HACKING INSTALL \
+      MAINTAINERS NEWS README TESTERS"
 
 # If you have more source files, list them here as SOURCE[1], SOURCE[2], etc.
 # If you know the URL for a source file, you can put that into the SRCURL[]
 # variable, and the SlackBuild script will try to download it for you.
 
 SOURCE[0]="${PRGNAM}-${VERSION}.tar.gz"
-SRCURL[0]="http://ovh.dl.sourceforge.net/sourceforge/gphoto/$PRGNAM-$VERSION.tar.gz"
+SRCURL[0]="http://surfnet.dl.sourceforge.net/sourceforge/gphoto/${PRGNAM}-${VERSION}.tar.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -81,6 +86,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
       wget -nv -O "${CWD}/${SOURCE[$i]}" "${SRCURL[$i]}"
       if [ $? -ne 0 ]; then
         echo "Downloading '${SOURCE[$i]}' failed... aborting the build."
+        mv "${CWD}/${SOURCE[$i]}" "${CWD}/${SOURCE[$i]}.FAIL"
         exit 1
       fi
     else
@@ -180,13 +186,14 @@ mkdir -p $PKG/usr/bin
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS \
       $PKG/usr/doc/$PRGNAM-$VERSION
+# Remove cruft
+rm -r $PKG/usr/doc/$PRGNAM-$VERSION/apidocs.html
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 # Move incorrectly installed man pages
 mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share
 # Compress the man page(s)
-gzip -9f $PKG/usr/man/*/*
-gzip -9f $PKG/usr/man/*/*/*
+find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
 
 # Strip binaries
 ( cd $PKG
@@ -198,8 +205,6 @@ gzip -9f $PKG/usr/man/*/*/*
 # --- OWNERSHIP, RIGHTS ---
 
 chmod -R o-w $PKG
-chown root:bin $PKG/usr/bin/* $PKG/usr/sbin/* $PKG/bin/* $PKG/sbin/* \
-               $PKG/usr/X11R6/bin/* $PKG/opt/kde/bin/* 2>/dev/null
 
 
 # --- PACKAGE DESCRIPTION ---
@@ -209,9 +214,8 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 if [ -f $CWD/doinst.sh ]; then
   cat $CWD/doinst.sh > $PKG/install/doinst.sh
 fi
-# I give in :-/
-if [ -f $CWD/slack-requires ]; then
-  cat $CWD/slack-requires > $PKG/install/slack-requires
+if [ -f $CWD/slack-required ]; then
+  cat $CWD/slack-required > $PKG/install/slack-required
 fi
 
 
@@ -222,9 +226,9 @@ cd $PKG
 makepkg --linkadd y --chown n $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
   2>&1 | tee $CWD/makepkg-${PRGNAM}.log
 (cd $TMP && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
-cat $CWD/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
-if [ -f $CWD/slack-requires ]; then
-  cat $CWD/slack-requires > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+if [ -f $PKG/install/slack-required ]; then
+  cat $PKG/install/slack-required > $TMP/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
 fi