diff options
-rw-r--r-- | desktop/catfish/catfish.SlackBuild | 33 | ||||
-rw-r--r-- | desktop/catfish/catfish.info | 8 | ||||
-rw-r--r-- | desktop/catfish/slack-desc | 2 |
3 files changed, 14 insertions, 29 deletions
diff --git a/desktop/catfish/catfish.SlackBuild b/desktop/catfish/catfish.SlackBuild index 7ba07e98a8..de89a4ef31 100644 --- a/desktop/catfish/catfish.SlackBuild +++ b/desktop/catfish/catfish.SlackBuild @@ -22,13 +22,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=catfish -VERSION=${VERSION:-0.3.2} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -39,20 +39,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -68,19 +54,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr - -make -make install DESTDIR=$PKG +python setup.py install --root=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +mv $PKG/usr/share/man $PKG/usr + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/desktop/catfish/catfish.info b/desktop/catfish/catfish.info index f773af3983..ddca2befb1 100644 --- a/desktop/catfish/catfish.info +++ b/desktop/catfish/catfish.info @@ -1,10 +1,10 @@ PRGNAM="catfish" -VERSION="0.3.2" +VERSION="1.4.2" HOMEPAGE="http://www.twotoasts.de/index.php/catfish/" -DOWNLOAD="http://www.twotoasts.de/media/catfish/catfish-0.3.2.tar.gz" -MD5SUM="b28db355094bfbe7de097678e91ce271" +DOWNLOAD="https://launchpad.net/catfish-search/1.4/1.4.2/+download/catfish-1.4.2.tar.gz" +MD5SUM="4166efbd6afd411a69714dde94028716" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pyxdg pexpect" +REQUIRES="pyxdg pexpect python-distutils-extra" MAINTAINER="David Woodfall" EMAIL="dave@dawoodfall.net" diff --git a/desktop/catfish/slack-desc b/desktop/catfish/slack-desc index 935eb10e51..5da119b466 100644 --- a/desktop/catfish/slack-desc +++ b/desktop/catfish/slack-desc @@ -13,7 +13,7 @@ catfish: interface is intentionally lightweight and simple, using only GTK+ 2. catfish: You can configure it to your needs by using several command line catfish: options. catfish: -catfish: Homepage: http://twotoasts.de/index.php?/pages/catfish_summary.html +catfish: Homepage: http://www.twotoasts.de/index.php/catfish/ catfish: catfish: catfish: |