3 files changed, 10 insertions, 33 deletions
diff --git a/libraries/qoauth/qoauth.SlackBuild b/libraries/qoauth/qoauth.SlackBuild
index 764577296d..69bcd891f5 100644
--- a/libraries/qoauth/qoauth.SlackBuild
+++ b/libraries/qoauth/qoauth.SlackBuild
@@ -2,20 +2,18 @@
 
 # Slackware build script for qoauth
 
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
 # Public domain.
 
 PRGNAM=qoauth
-VERSION=${VERSION:-1.0}
+VERSION=${VERSION:-1.0.1}
 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 ) ;;
   esac
 fi
@@ -44,9 +42,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION-src
 tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$VERSION-src
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -54,15 +52,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# install under /usr/lib64 when building on x86_64
-# see http://github.com/ayoy/qoauth/commit/0391e189c50dffb1e5ff2a930eb5cd510e76b98c
-patch -p0 <$CWD/src_src.pro.patch
-
 qmake -unix PREFIX=/usr DOCDIR=/usr/doc/$PRGNAM-$VERSION \
     QMAKE_CFLAGS="$SLKCFLAGS" \
     QMAKE_CXXFLAGS="$SLKCFLAGS" \
     $PRGNAM.pro
-make 
+make
 make install INSTALL_ROOT=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -77,4 +71,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/libraries/qoauth/qoauth.info b/libraries/qoauth/qoauth.info
index af84761eae..023fd9f4ec 100644
--- a/libraries/qoauth/qoauth.info
+++ b/libraries/qoauth/qoauth.info
@@ -1,10 +1,10 @@
 PRGNAM="qoauth"
-VERSION="1.0"
+VERSION="1.0.1"
 HOMEPAGE="http://wiki.github.com/ayoy/qoauth/"
-DOWNLOAD="http://files.ayoy.net/qoauth/release/1.0/src/qoauth-1.0-src.tar.bz2"
-MD5SUM="eb95118ad4ee43f96a27bef7fcf7fb15"
+DOWNLOAD="http://files.ayoy.net/qoauth/release/1.0.1/src/qoauth-1.0.1-src.tar.bz2"
+MD5SUM="bcb6d01e6c9a6fb22099c9e0f5889578"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"
diff --git a/libraries/qoauth/src_src.pro.patch b/libraries/qoauth/src_src.pro.patch
deleted file mode 100644
index dbd5e50a97..0000000000
--- a/libraries/qoauth/src_src.pro.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/src.pro~	2009-08-08 11:37:32.000000000 +0300
-+++ src/src.pro	2010-02-13 00:52:54.000000000 +0200
-@@ -62,7 +62,12 @@
-     system( ./pcfile.sh $${INSTALL_PREFIX} $${VERSION} )
-     pkgconfig.files = qoauth.pc
- 
--    target.path = $${INSTALL_PREFIX}/lib
-+    contains(QMAKE_HOST.arch, x86_64) {
-+      target.path = $${INSTALL_PREFIX}/lib64
-+    } else {
-+      target.path = $${INSTALL_PREFIX}/lib
-+    }
-+
-     headers.path = $${INSTALL_PREFIX}/include/QtOAuth
-     docs.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}-$${VERSION}
-     pkgconfig.path = $${target.path}/pkgconfig