diff options
| -rw-r--r-- | network/wireshark/wireshark.SlackBuild | 28 | ||||
| -rw-r--r-- | network/wireshark/wireshark.info | 8 |
2 files changed, 15 insertions, 21 deletions
diff --git a/network/wireshark/wireshark.SlackBuild b/network/wireshark/wireshark.SlackBuild index 68885f6777925..40aada1618d2f 100644 --- a/network/wireshark/wireshark.SlackBuild +++ b/network/wireshark/wireshark.SlackBuild @@ -2,8 +2,8 @@ # Slackware build script for wireshark +# Copyright 2008-2010 Michiel van Wessem, Manchester, United Kingdom # Originally written by Jick Nan (jick.nan@gmail.com) -# Copyright 2008-2009 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -26,17 +26,16 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wireshark -VERSION=${VERSION:-1.2.7} +VERSION=${VERSION:-1.2.9} BUILD=${BUILD:-1} 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 ) ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -54,9 +53,6 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -102,19 +98,12 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -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* NEWS README* doc/READM* \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +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/share/applications -mkdir -p $PKG/usr/share/icons/{hi,lo}color/{16x16/apps,32x32/apps,48x48/apps} cp $PRGNAM.desktop $PKG/usr/share/applications +mkdir -p $PKG/usr/share/icons/{hi,lo}color/{16x16,32x32,48x48}/apps for col in {lo,hi}; do for size in {16,32,48}; do cp image/${col}${size}-app-$PRGNAM.png \ @@ -122,6 +111,11 @@ for col in {lo,hi}; do done done +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS* COPYING ChangeLog INSTALL* NEWS README* doc/READM* \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/network/wireshark/wireshark.info b/network/wireshark/wireshark.info index 6481ffb9d1217..e2197e7b3db4a 100644 --- a/network/wireshark/wireshark.info +++ b/network/wireshark/wireshark.info @@ -1,10 +1,10 @@ PRGNAM="wireshark" -VERSION="1.2.7" +VERSION="1.2.9" HOMEPAGE="http://www.wireshark.org/" -DOWNLOAD="http://www.wireshark.org/download/src/wireshark-1.2.7.tar.bz2" -MD5SUM="cff6b18aa47a7e3eb973efe62c676b50" +DOWNLOAD="http://www.wireshark.org/download/src/wireshark-1.2.9.tar.bz2" +MD5SUM="a4240c36f1e668d85b703eacb7c0a95e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" -APPROVED="dsomero" +APPROVED="rworkman" |