Updated for 0.6.7

Add TAG=alien; better SRCDIR; add SlackBuild to docdir

1 files changed, 30 insertions, 27 deletions

diff --git a/partimage/build/partimage.SlackBuild b/partimage/build/partimage.SlackBuild
index ce9b9000..df9d44dd 100755
--- a/partimage/build/partimage.SlackBuild
+++ b/partimage/build/partimage.SlackBuild
@@ -40,6 +40,8 @@
 #             * Update. Slackware 12.0 no longer comes with the static
 #               library for libslang, so a recompile of the slang package
 #               was needed.
+# 0.6.7-1:    18/may/2008 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 # 
 # Run 'sh partimage.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -50,9 +52,14 @@
 # Set initial variables:
 
 PRGNAM=partimage
-VERSION=${VERSION:-0.6.6}
+VERSION=${VERSION:-0.6.7}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
+TAG=${TAG:-alien}
+
+DOCS="ABOUT-NLS AUTHORS BOOT* BUGS COPYING ChangeLog FORMAT FUTURE INSTALL \
+      PACKAGES README* ROADMAP SURVEY TESTS THANKS TODO \
+      $SRCDIR/00README.slackware $SRCDIR/makecertificate.sh"
 
 # Define the behaviour of the partimage binaries:
 # Define 'USESSL=no' if you don't want mandatory SSL connections between client
@@ -63,16 +70,13 @@ USESSL=yes
 USERLOGONS=yes
 
 # Where do we look for sources?
-CWD=$(pwd)
-SRCDIR=$(dirname $0)
-[ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
+SRCDIR=$(cd $(dirname $0); pwd)
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://downloads.sourceforge.net/partimage/partimage-0.6.6.tar.bz2
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2"
 SRCURL="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2"
 
@@ -95,9 +99,6 @@ else
 fi
 
 case "$ARCH" in
-  i386)      SLKCFLAGS="-O2 -march=i386 -m${MOPT}=i686"
-             SLKLDFLAGS=""; LIBDIRSUFFIX=""
-             ;;
   i486)      SLKCFLAGS="-O2 -march=i486 -m${MOPT}=i686"
              SLKLDFLAGS=""; LIBDIRSUFFIX=""
              ;;
@@ -120,11 +121,7 @@ mkdir -p $OUTPUT          # place for the package to be saved
 mkdir -p $TMP/tmp-$PRGNAM # location to build the source
 mkdir -p $PKG             # place for the package to be built
 rm -rf $PKG/*             # always erase old package's contents
-if [ "$P1" != "--oldbuild" ]; then
-  # Use the "--oldbuild" parameter to keep old build files and continue;
-  # By default we remove the remnants of previous build and continue.
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
+rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
 
 # Source file availability:
 if ! [ -f ${SOURCE} ]; then
@@ -171,8 +168,9 @@ elif $(file ${SOURCE} | grep -q ": gzip"); then
   tar -xzvf ${SOURCE}
 fi
 cd ${PRGNAM}-${VERSION}
-patch -p0 < $SRCDIR/partimage_makefile.patch \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+# No longer needed:
+#patch -p0 < $SRCDIR/partimage_makefile.patch \
+#  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -193,6 +191,7 @@ CFLAGS="$SLKCFLAGS" \
             --localstatedir=/var \
             --sysconfdir=/etc \
             --mandir=/usr/man \
+            --docdir=/usr/doc/$PRGNAM-$VERSION \
             --enable-all-static \
             --enable-ssl=${USESSL} \
             ${CONFIGLOGON} \
@@ -211,19 +210,23 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
+# It may be that this file is now distributed with the sources (starting
+# with 0.6.7 - if so, it should overwrite our own .new file:
+mv $PKG/etc/partimaged/partimagedusers{,.new}
+
 # Add documentation:
-DOCS="ABOUT-NLS AUTHORS BOOT* BUGS COPYING ChangeLog FORMAT FUTURE INSTALL \
-      PACKAGES README* ROADMAP SURVEY TESTS THANKS TODO \
-      $SRCDIR/00README.slackware $SRCDIR/makecertificate.sh"
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
-# Man pages are not installed by default:
-mkdir -p $PKG/usr/man/man{1,5,8}
-cp doc/en/man/partimage.1 $PKG/usr/man/man1
-cp doc/en/man/partimagedusers.5 $PKG/usr/man/man5
-cp doc/en/man/partimaged.8 $PKG/usr/man/man8
+# Man pages are not installed by default (and 0.6.7 seems to have removed them)
+if [ -d ./doc/en/man ]; then
+  mkdir -p $PKG/usr/man/man{1,5,8}
+  cp doc/en/man/partimage.1 $PKG/usr/man/man1
+  cp doc/en/man/partimagedusers.5 $PKG/usr/man/man5
+  cp doc/en/man/partimaged.8 $PKG/usr/man/man8
+fi
 
 # Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
@@ -249,13 +252,13 @@ fi
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
 cd $OUTPUT
-md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.tgz.md5
 cd -
-cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
+cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt
 if [ -f $PKG/install/slack-required ]; then
-  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
+  cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
 fi
 
 # Clean up the extra stuff: