Final script for release

1 files changed, 14 insertions, 51 deletions

diff --git a/recoll/build/recoll.SlackBuild b/recoll/build/recoll.SlackBuild
index 1ae2b938..03906247 100755
--- a/recoll/build/recoll.SlackBuild
+++ b/recoll/build/recoll.SlackBuild
@@ -28,7 +28,7 @@
 # For:       recoll
 # Descr:     Desktop full text search tool with a qt gui
 # URL:       http://www.lesbonscomptes.com/recoll/
-# Needs:     
+# Needs:     xapian-core < 1.0.0
 # Changelog:
 # 1.8.1-1:   18/May/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
@@ -153,13 +153,6 @@ echo "++"
 echo "|| $PRGNAM-$VERSION"
 echo "++"
 
-cd $PKG
-
-# Explode the package framework:
-if [ -f $SRCDIR/_$PRGNAM.tar.gz ]; then
-  explodepkg $SRCDIR/_$PRGNAM.tar.gz
-fi
-
 cd $TMP/tmp-$PRGNAM
 
 
@@ -170,38 +163,24 @@ if `file ${SOURCE} | grep -q ": bzip2"`; then
   tar -xjvf ${SOURCE}
 elif `file ${SOURCE} | grep -q ": gzip"`; then
   tar -xzvf ${SOURCE}
-elif `file ${SOURCE} | grep -qi ": zip"`; then
-  unzip ${SOURCE}
-elif `file ${SOURCE} | grep -qi ": 7-zip"`; then
-  7za -x ${SOURCE}
-else
-  tar -xvf ${SOURCE}  # Just try generically
 fi
 chown -R root:root *
 chmod -R u+w,go+r-w,a-s *
- 
-if [ -d ${PRGNAM}-${VERSION} ]; then
-  cd ${PRGNAM}-${VERSION}
-else
-  cd  ${PRGNAM}*  # a little less specific
-fi
-
-
-# --- BUILDING ---
+cd ${PRGNAM}-${VERSION}
 
 echo Building ...
-
 LDFLAGS="$SLKLDFLAGS" \
 CFLAGS="$SLKCFLAGS" \
 ./configure --prefix=/usr \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-	    --with-inotify \
             --program-prefix="" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
+	    # Not yet - needs 2.6 kernelheaders and a patch:
+            # --with-inotify \
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
 #
@@ -215,6 +194,12 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
+# Fix the .desktop file for Slackware 11.0 and earlier:
+mkdir -p $PKG/usr/share/pixmaps
+cp $PKG/usr/share/icons/hicolor/48x48/apps/recoll-searchgui.png \
+  $PKG/usr/share/pixmaps/
+sed -i -e "s#^Icon=recoll-searchgui#Icon=/usr/share/pixmaps/recoll-searchgui.png#" $PKG/usr/share/applications/recoll-searchgui.desktop
+
 # Add this to the doinst.sh
 ! [ -d $PKG/install ] && mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh
@@ -239,42 +224,26 @@ config() {
 
 EOINS
 
-
-# --- DOCUMENTATION ---
-
+# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
+mv $PKG/usr/share/recoll/doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rmdir $PKG/usr/share/recoll/doc
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Move incorrectly installed man pages, if any
-[ -d $PKG/usr/share/man ] && \
-  mv $PKG/usr/share/man $PKG/usr/ && rmdir $PKG/usr/share || true
 # Compress the man page(s)
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
   for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Compress info pages and remove the package's dir file
-if [ -d $PKG/usr/info ]; then
-  rm -rf $PKG/usr/info/dir
-  gzip -9f $PKG/usr/info/*.info*
-fi
-
 # Strip binaries
 cd $PKG
 find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 cd -
 
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-
-
-# --- PACKAGE DESCRIPTION ---
-
+# Package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ -f $SRCDIR/doinst.sh ]; then
@@ -284,9 +253,6 @@ if [ -f $SRCDIR/slack-required ]; then
   cat $SRCDIR/slack-required > $PKG/install/slack-required
 fi
 
-
-# --- BUILDING ---
-
 # Build the package:
 cd $PKG
 makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
@@ -298,9 +264,6 @@ if [ -f $PKG/install/slack-required ]; then
   cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.dep
 fi
 
-
-# --- CLEANUP ---
-
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM