Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/rcs/PKGBUILD
	libre/cups-filters-libre/PKGBUILD

1 files changed, 12 insertions, 7 deletions

diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 49e5f52b4..16d8f8e99 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85588 2013-03-03 17:28:55Z dreisner $
+# $Id: PKGBUILD 87649 2013-04-05 01:44:23Z allan $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
-pkgname=('packagekit' 'packagekit-qt2' 'packagekit-python')
+pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
 pkgver=0.7.6
-pkgrel=5
+pkgrel=6
 pkgdesc="A system designed to make installation and updates of packages easier."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.packagekit.org"
@@ -14,9 +14,11 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
 options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
         'adopt.patch'
+	'alpm.patch'
 	'libarchive.patch')
 sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
             'd0ee8580202a878571dddd470017731299c63e5c5120afe881bb41b9544322b8'
+	    '067f39917f5442b8146c793b62f86f66fc8a4c7e391c0f3219d13f98d45ba630'
 	    '0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
 
 build() {
@@ -27,10 +29,11 @@ build() {
   sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py
 
   patch -Np1 -i "$srcdir/adopt.patch"
+  patch -Np1 -i "$srcdir/alpm.patch"
   patch -Np1 -i "$srcdir/libarchive.patch"
 
   export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
+  ./autogen.sh --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
               --libexecdir=/usr/lib/PackageKit \
@@ -49,14 +52,14 @@ build() {
               --disable-dummy \
               --enable-alpm \
               --with-default-backend=alpm
-  make -s CFLAGS='-D_FILE_OFFSET_BITS=64'
+  make -s CFLAGS='-D_FILE_OFFSET_BITS=64 -O2 -Wno-unused-local-typedefs'
 }
 
 package_packagekit() {
   backup=('var/lib/PackageKit/transactions.db'
           'etc/PackageKit/alpm.d/pacman.conf'
           'etc/PackageKit/alpm.d/repos.list')
-  depends=('dbus-glib' 'pacman>=4.0.0' 'pacman<4.1.0' 'polkit'
+  depends=('dbus-glib' 'pacman>=4.1.0' 'pacman<4.2.0' 'polkit'
            'shared-mime-info' 'sqlite' 'udev')
   optdepends=('networkmanager')
   install='packagekit.install'
@@ -89,9 +92,11 @@ package_packagekit-qt2() {
   make DESTDIR="$pkgdir" install
 }
 
-package_packagekit-python() {
+package_python2-packagekit() {
   depends=('packagekit' 'python2')
   pkgdesc=('Python bindings for PackageKit')
+  conflicts=('packagekit-python')
+  replaces=('packagekit-python')
 
   cd "$srcdir/PackageKit-$pkgver/lib/python"