From 985e60f2412f4081958405e38a73e0b490ea7b2c Mon Sep 17 00:00:00 2001
From: Anke <abveritas@chakra-project.org>
Date: Sun, 26 Aug 2012 17:47:33 +0000
Subject: [PATCH] lensfun & hwinfo updates

---
 hwinfo/PKGBUILD  | 18 ++++++------------
 lensfun/PKGBUILD | 22 ++++++++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hwinfo/PKGBUILD b/hwinfo/PKGBUILD
index 58f40aad5..6a95a7fad 100644
--- a/hwinfo/PKGBUILD
+++ b/hwinfo/PKGBUILD
@@ -1,11 +1,10 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas<manutortosa[at]chakra-project[dot]org>
 
 pkgname=hwinfo
-pkgver=19.1
+pkgver=20.0
 pkgrel=1
 pkgdesc="A simple program that lists results from the hardware detection library."
 arch=('i686' 'x86_64')
@@ -14,25 +13,22 @@ license=('GPL2')
 depends=('perl' 'libx86emu')
 makedepends=('sysfsutils' 'rpmextract' 'flex')
 options=('!emptydirs')
-source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.2.src.rpm"
+source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/${pkgname}-${pkgver}-1.4.src.rpm"
         "kbd.patch")
+md5sums=('8cbc3330315b41c1c723a68f86ca13e1'
+         '1500ecfa26f6aaf4d7967eea74e86e5d')
 
 build() {
   cd "${srcdir}"
 
   msg2 "Extracting source rpm..."
-  rpmextract.sh "${pkgname}-${pkgver}-1.2.src.rpm"
+  rpmextract.sh "${pkgname}-${pkgver}-1.4.src.rpm"
   tar -xjf ${pkgname}-${pkgver}.tar.bz2
   cd "${pkgname}-${pkgver}"
   msg2 "Patching..."
   patch -p0 < ../kbd.patch 
   msg2 "Compiling..."
   
-  # Fix Makefile using /usr/lib64 instead of /usr/lib - it broke x86_64, possibly i686 too. 
-  # Comment if this fix breaks it.
-  #sed -i 's_usr/lib64_usr/lib_' src/hd/Makefile 
-  
-  #Added this from ARCH, to fix the above issue:
   make -j1 CFLAGS+="-fPIC -I${srcdir}/${pkgname}-${pkgver}/src/hd" LIBDIR=/usr/lib
 }
 
@@ -44,5 +40,3 @@ package() {
   #  disabled the following line to add the one above
   #  make DESTDIR=${pkgdir} install
 }
-md5sums=('d882c16b44d86aff480e0f86c1ef129d'
-         '1500ecfa26f6aaf4d7967eea74e86e5d')
diff --git a/lensfun/PKGBUILD b/lensfun/PKGBUILD
index 6241875f7..bfba48d9a 100644
--- a/lensfun/PKGBUILD
+++ b/lensfun/PKGBUILD
@@ -1,12 +1,11 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=lensfun
-pkgver=0.2.5
-pkgrel=2
+pkgver=0.2.6
+pkgrel=1
 pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
 arch=(i686 x86_64)
 url="http://lensfun.berlios.de/"
@@ -14,11 +13,18 @@ license=('LGPL3')
 depends=('glibc' 'glib2')
 makedepends=('python2' 'libpng')
 source=(http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2) 
+md5sums=('740e4749db04da0a597630dd6339b966')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --libdir=/usr/lib || return 1
-    make all || return 1
-    make INSTALL_PREFIX="$pkgdir" install || return 1
+    sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
+    ./configure \
+        --prefix=/usr \
+        --libdir=/usr/lib
+    make all
+}
+
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    make INSTALL_PREFIX="$pkgdir" install
 }
-md5sums=('a10438dffae68a5988fc54b0393a3755')