aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/digikam/README5
-rw-r--r--graphics/digikam/digikam.SlackBuild29
-rw-r--r--graphics/digikam/digikam.info8
-rw-r--r--graphics/digikam/doinst.sh5
-rw-r--r--graphics/digikam/slack-desc8
5 files changed, 24 insertions, 31 deletions
diff --git a/graphics/digikam/README b/graphics/digikam/README
index 971b3ad9670e7..74e3e8be86006 100644
--- a/graphics/digikam/README
+++ b/graphics/digikam/README
@@ -5,5 +5,6 @@ by directory layout or by custom collections. An easy to use interface
is provided that enables you to connect to your camera and preview,
download and/or delete your images.
-exiv2, jasper, libgphoto2, libkdcraw, libkexiv2, and libkipi (also
-available at SBo) are required to build digiKam.
+exiv2, jasper, libkdcraw, libkexiv2, and libkipi (available at SBo)
+are required to build digiKam. kipi-plugins is an optional (but
+recommended) runtime dependency.
diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index 4f46f3f319e8b..ae5ed2c22f542 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for digiKam
-# Copyright 2007-2008 Frank Caraballo <fecaraballo{at}gmail{dot}com>
+# Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=digikam
-VERSION=0.9.4
+VERSION=${VERSION:-0.9.5}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,8 +33,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README RELEASE.rev TODO"
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
@@ -49,9 +47,8 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
cd $PRGNAM-$VERSION
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -68,11 +65,8 @@ CXXFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=$KDEPREF/man \
- --program-prefix="" \
- --program-suffix="" \
- --disable-debug \
- --enable-shared=yes \
- --enable-static=no
+ --without-included-sqlite3 \
+ --build=$ARCH-slackware-linux
make
make install-strip DESTDIR=$PKG
@@ -83,18 +77,15 @@ make install-strip DESTDIR=$PKG
)
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README RELEASE.rev TODO \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-( cd $PKG
-find . -type d -depth -exec rmdir {} \; 2>/dev/null
-find . -type f -size 0c -exec rm {} \; 2>/dev/null
-)
+find $PKG -type d -depth -exec rmdir {} \; 2>/dev/null
mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n -p $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/graphics/digikam/digikam.info b/graphics/digikam/digikam.info
index 16c3fe2e5131d..670201dfed246 100644
--- a/graphics/digikam/digikam.info
+++ b/graphics/digikam/digikam.info
@@ -1,8 +1,8 @@
PRGNAM="digikam"
-VERSION="0.9.4"
+VERSION="0.9.5"
HOMEPAGE="http://www.digikam.org/"
-DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-0.9.4.tar.bz2"
-MD5SUM="b0f3fa00bd054b0497146e6ce24dab7c"
+DOWNLOAD="http://downloads.sourceforge.net/digikam/digikam-0.9.5.tar.bz2"
+MD5SUM="fc4085169256cffd77aa8e8025792b89"
MAINTAINER="Frank Caraballo"
EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="David Somero" \ No newline at end of file
+APPROVED="dsomero"
diff --git a/graphics/digikam/doinst.sh b/graphics/digikam/doinst.sh
index df69bdfae8506..aeae05cd85a54 100644
--- a/graphics/digikam/doinst.sh
+++ b/graphics/digikam/doinst.sh
@@ -1,3 +1,4 @@
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database -q usr/share/applications/kde
+if [ -x usr/bin/update-desktop-database ]; then
+ usr/bin/update-desktop-database -q usr/share/applications/kde
fi
+
diff --git a/graphics/digikam/slack-desc b/graphics/digikam/slack-desc
index 6961e5a03f5c1..8d0c1e16b3a71 100644
--- a/graphics/digikam/slack-desc
+++ b/graphics/digikam/slack-desc
@@ -1,9 +1,9 @@
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
digikam: digiKam (KDE Photo Management Application)