From 91e62177b4609cb34fd1d4063287ec4e39879794 Mon Sep 17 00:00:00 2001
From: Larry Hajali <larryhaja[at]gmail[dot]com>
Date: Fri, 15 Oct 2010 22:04:49 -0500
Subject: libraries/libmusicbrainz3: Updated for version 3.0.3.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 .../libmusicbrainz3/libmusicbrainz3.SlackBuild     | 24 ++++++++++------------
 libraries/libmusicbrainz3/libmusicbrainz3.info     |  6 +++---
 libraries/libmusicbrainz3/patches/gcc-4.3.patch    | 10 ---------
 .../patches/pkgconfig-private.patch                | 13 ------------
 4 files changed, 14 insertions(+), 39 deletions(-)
 delete mode 100644 libraries/libmusicbrainz3/patches/gcc-4.3.patch
 delete mode 100644 libraries/libmusicbrainz3/patches/pkgconfig-private.patch

diff --git a/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild b/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
index 1f571516db..b2e26152d4 100644
--- a/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
+++ b/libraries/libmusicbrainz3/libmusicbrainz3.SlackBuild
@@ -5,18 +5,16 @@
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 
 PRGNAM=libmusicbrainz3
-VERSION=${VERSION:-3.0.2}
+VERSION=3.0.3
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=libmusicbrainz
 
-# 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 ) ;;
   esac
 fi
@@ -55,16 +53,16 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-patch -p1 < $CWD/patches/gcc-4.3.patch
-patch -p1 < $CWD/patches/pkgconfig-private.patch
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release ..
 
-mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-	-DLIB_SUFFIX=${LIBDIRSUFFIX} \
-	-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-	-DCMAKE_BUILD_TYPE=Release ..
-  make
+  make VERBOSE=1
   make install DESTDIR=$PKG
 cd -
 
@@ -72,7 +70,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a {AUTHORS,COPYING,NEWS,README}.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libmusicbrainz3/libmusicbrainz3.info b/libraries/libmusicbrainz3/libmusicbrainz3.info
index a79d0c03ac..9e05167dd7 100644
--- a/libraries/libmusicbrainz3/libmusicbrainz3.info
+++ b/libraries/libmusicbrainz3/libmusicbrainz3.info
@@ -1,8 +1,8 @@
 PRGNAM="libmusicbrainz3"
-VERSION="3.0.2"
+VERSION="3.0.3"
 HOMEPAGE="http://musicbrainz.org/doc/libmusicbrainz"
-DOWNLOAD="ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.2.tar.gz"
-MD5SUM="648ecd43f7b80852419aaf73702bc23f"
+DOWNLOAD="ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-3.0.3.tar.gz"
+MD5SUM="f4824d0a75bdeeef1e45cc88de7bb58a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Larry Hajali"
diff --git a/libraries/libmusicbrainz3/patches/gcc-4.3.patch b/libraries/libmusicbrainz3/patches/gcc-4.3.patch
deleted file mode 100644
index c13b2e1ada..0000000000
--- a/libraries/libmusicbrainz3/patches/gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/utils_private.cpp~	2008-11-07 20:07:10.000000000 +0000
-+++ a/src/utils_private.cpp	2008-11-07 20:07:16.000000000 +0000
-@@ -20,6 +20,7 @@
-  * $Id: utils_private.cpp 8466 2006-09-05 08:59:44Z luks $
-  */
-  
-+#include <cstdio>
- #include <cstdlib>
- #include <cstring>
- #include <cstdarg>
diff --git a/libraries/libmusicbrainz3/patches/pkgconfig-private.patch b/libraries/libmusicbrainz3/patches/pkgconfig-private.patch
deleted file mode 100644
index a6307d51d2..0000000000
--- a/libraries/libmusicbrainz3/patches/pkgconfig-private.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libmusicbrainz-3.0.2/libmusicbrainz3.pc.cmake
-===================================================================
---- libmusicbrainz-3.0.2.orig/libmusicbrainz3.pc.cmake	2008-12-22 21:53:56.000000000 +0000
-+++ libmusicbrainz-3.0.2/libmusicbrainz3.pc.cmake	2008-12-22 21:54:00.000000000 +0000
-@@ -7,7 +7,7 @@
- Description: The Musicbrainz Client Library.
- URL: http://musicbrainz.org/doc/libmusicbrainz
- Version: ${PROJECT_VERSION}
--Requires: neon >= 0.25, libdiscid
-+Requires.private: neon >= 0.25, libdiscid
- Libs: -L${LIB_INSTALL_DIR} -lmusicbrainz3
- Cflags: -I${INCLUDE_INSTALL_DIR}
- 
-- 
cgit v1.2.3