libraries/exempi: Updated for version 2.1.1

5 files changed, 16 insertions, 35 deletions

diff --git a/libraries/exempi/README b/libraries/exempi/README
index 5d0322a0d5..4948d271f6 100644
--- a/libraries/exempi/README
+++ b/libraries/exempi/README
@@ -25,6 +25,3 @@ The overall changes include:
 * Code changes for UN*X systems compatibility.
 * Architecture support for 64-bits (x86_64) and others.
 * Test suite.
-
-exempi requires the boost library. A buildscript is available 
-at slackbuilds.org
diff --git a/libraries/exempi/doinst.sh b/libraries/exempi/doinst.sh
deleted file mode 100644
index 234ad26971..0000000000
--- a/libraries/exempi/doinst.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/$PRGNAM.conf.new
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database -q usr/share/applications
-fi
-
-if [ -x usr/bin/update-mime-database ]; then
-  usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
diff --git a/libraries/exempi/exempi.SlackBuild b/libraries/exempi/exempi.SlackBuild
index d5c80557c9..d0091aa8ef 100644
--- a/libraries/exempi/exempi.SlackBuild
+++ b/libraries/exempi/exempi.SlackBuild
@@ -24,7 +24,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=exempi
-VERSION=${VERSION:-2.1.0}
+VERSION=${VERSION:-2.1.1}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,10 +36,13 @@ 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"
 fi
 
 set -e # Exit on most errors
@@ -61,6 +64,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -71,8 +75,10 @@ make
 make install-strip DESTDIR=$PKG
 
 ( 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
+  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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/exempi/exempi.info b/libraries/exempi/exempi.info
index 89b83e19bf..145bcba84b 100644
--- a/libraries/exempi/exempi.info
+++ b/libraries/exempi/exempi.info
@@ -1,8 +1,10 @@
 PRGNAM="exempi"
-VERSION="2.1.0"
+VERSION="2.1.1"
 HOMEPAGE="http://libopenraw.freedesktop.org/wiki/Exempi"
-DOWNLOAD="http://libopenraw.freedesktop.org/download/exempi-2.1.0.tar.gz"
-MD5SUM="30dfa5c394b4a3901c66f6e60e8b22e4"
+DOWNLOAD="http://libopenraw.freedesktop.org/download/exempi-2.1.1.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="62ecb5a01387b9f940a5429b3df67e65"
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
 APPROVED="dsomero"
diff --git a/libraries/exempi/slack-desc b/libraries/exempi/slack-desc
index 3eb458bea1..ad66c64c00 100644
--- a/libraries/exempi/slack-desc
+++ b/libraries/exempi/slack-desc
@@ -15,5 +15,5 @@ exempi: The Adobe Extensible Metadata Platform (XMP) is a standard for
 exempi: processing and storing standardized and proprietary metadata, 
 exempi: created by Adobe Systems Inc..
 exempi:
-exempi: hompepage: http://libopenraw.freedesktop.org/wiki/Exempi
+exempi: Homepage: http://libopenraw.freedesktop.org/wiki/Exempi
 exempi: