diff --git a/graphics/gtkam/README b/graphics/gtkam/README index 5b7d156363..2b9fa41fdc 100644 --- a/graphics/gtkam/README +++ b/graphics/gtkam/README @@ -4,12 +4,7 @@ libgphoto2 is a portable library which gives access to literally hundreds of digital cameras. This package includes a graphical GTK2 frontend and a GIMP plugin. -Homepage: http://www.gphoto.org - Gtkam needs the following packages to build sucsessfully: -libgphoto2 -libexif-gtk - + libgphoto2 + libexif-gtk SlackBuild scripts for these are available at SlackBuilds.org. - -To enable GIMP functionality, GIMP has to be installed prior gtkam. diff --git a/graphics/gtkam/doinst.sh b/graphics/gtkam/doinst.sh index 7ebfa3ab4d..d29395de0d 100644 --- a/graphics/gtkam/doinst.sh +++ b/graphics/gtkam/doinst.sh @@ -1,3 +1,5 @@ + if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database -q usr/share/applications fi + diff --git a/graphics/gtkam/gtkam.SlackBuild b/graphics/gtkam/gtkam.SlackBuild index b8e9633087..1f00b314a3 100644 --- a/graphics/gtkam/gtkam.SlackBuild +++ b/graphics/gtkam/gtkam.SlackBuild @@ -1,21 +1,24 @@ #!/bin/sh # Slackware Build Script for gtkam -# (C) 2007 Michael Wagner -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. +# (C) 2007 Michael Wagner +# All rights reserved. # -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. # +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by the SlackBuilds Project @@ -26,7 +29,7 @@ VERSION=0.1.14 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CWD=`pwd` +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -54,10 +57,9 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var/lib \ + --localstatedir=/var/lib\ --mandir=/usr/man \ --disable-static \ - --disable-rpath \ --disable-scrollkeeper \ --without-gnome \ --without-bonobo \ @@ -76,7 +78,7 @@ make install DESTDIR=$PKG || exit 1 if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man find . -name "*.?" -type f 2> /dev/null | xargs gzip -9 2> /dev/null - for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done ) fi @@ -90,9 +92,8 @@ for i in gnome omf doc; do rm -rf $PKG/usr/share/$i &> /dev/null done -# Replace upstreams png icon as it is corrupt (and replace paths) -sed -i 's#Icon=gtkam.png#Icon=/usr/share/pixmaps/gtkam.png#' $PKG/usr/share/applications/$PRGNAM.desktop -install -m 0644 -o root -g root $CWD/gtkam.png $PKG/usr/share/pixmaps +# Replace upstreams png icon as it is corrupt +cat $CWD/gtkam.png > $PKG/usr/share/pixmaps/gtkam.png mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/graphics/gtkam/gtkam.info b/graphics/gtkam/gtkam.info index b402f06341..5ba79f0849 100644 --- a/graphics/gtkam/gtkam.info +++ b/graphics/gtkam/gtkam.info @@ -4,5 +4,5 @@ HOMEPAGE="http://www.gphoto.org" DOWNLOAD="http://dl.sourceforge.net/gphoto/gtkam-0.1.14.tar.bz2" MD5SUM="2b6e6fea0bc55d9f78952f0061d7ef7e" MAINTAINER="Michael Wagner" -ENAIL="lapinours@web.de" -APPROVED="BP{k}" +EMAIL="lapinours@web.de" +APPROVED="BP{k},rworkman"