version 3.2.6-2

3 files changed, 47 insertions, 29 deletions

diff --git a/.AURINFO b/.AURINFO
new file mode 100644
index 000000000000..f41457d76ff5
--- /dev/null
+++ b/.AURINFO
@@ -0,0 +1,30 @@
+pkgbase = gconf-gtk2
+	pkgdesc = A configuration database system compiled for GTK2
+	pkgver = 3.2.6
+	pkgrel = 2
+	url = http://www.gnome.org
+	install = gconf.install
+	arch = i686
+	arch = x86_64
+	license = LGPL
+	makedepends = intltool
+	makedepends = gtk-doc
+	makedepends = gobject-introspection
+	depends = libxml2
+	depends = polkit
+	depends = libldap
+	depends = dbus-glib
+	depends = gtk2
+	provides = gconf=3.2.6
+	conflicts = gconf
+	replaces = gconf
+	source = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
+	source = gconf-merge-schema
+	source = gconfpkg
+	source = gconf-reload.patch
+	source = 01_xml-gettext-domain.patch
+	options = !libtool
+	options = emptydirs
+
+pkgname = gconf-gtk2
+
diff --git a/.SRCINFO b/.SRCINFO
index ccffbd95613b..bfee7aa9c19c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gconf-gtk2
 	pkgdesc = A configuration database system compiled for GTK2
-	pkgver = 3.2.5
-	pkgrel = 6
+	pkgver = 3.2.6
+	pkgrel = 2
 	url = http://www.gnome.org
 	install = gconf.install
 	arch = i686
@@ -10,27 +10,22 @@ pkgbase = gconf-gtk2
 	makedepends = intltool
 	makedepends = gtk-doc
 	makedepends = gobject-introspection
+	depends = libxml2
 	depends = polkit
+	depends = libldap
 	depends = dbus-glib
 	depends = gtk2
-	optdepends = python2: for gsettings-schema-convert utility
-	provides = gconf=3.2.5
+	provides = gconf=3.2.6
 	conflicts = gconf
 	replaces = gconf
 	options = !libtool
 	options = emptydirs
-	source = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.5.tar.xz
-	source = gconf-dbus-fix-use-after-free.patch
-	source = gconf-dbus-fix-shutdown.patch
-	source = gsettings-schema-convert-dont-fail.patch
+	source = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
 	source = gconf-merge-schema
 	source = gconfpkg
 	source = gconf-reload.patch
 	source = 01_xml-gettext-domain.patch
-	sha256sums = 4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6
-	sha256sums = 76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d
-	sha256sums = ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2
-	sha256sums = be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19
+	sha256sums = 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
 	sha256sums = ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028
 	sha256sums = bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898
 	sha256sums = 567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694
diff --git a/PKGBUILD b/PKGBUILD
index 1a950d375414..7094a37e87da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,32 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 
 pkgname=gconf-gtk2
-pkgver=3.2.5
-pkgrel=6
+pkgver=3.2.6
+pkgrel=2
 pkgdesc="A configuration database system compiled for GTK2"
 arch=(i686 x86_64)
 license=('LGPL')
 provides=("gconf=$pkgver")
 conflicts=('gconf')
 replaces=('gconf')
-depends=('polkit' 'dbus-glib' 'gtk2')
-optdepends=('python2: for gsettings-schema-convert utility')
+depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk2')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
 options=('!libtool' 'emptydirs')
 install=gconf.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
-        gconf-dbus-fix-use-after-free.patch
-        gconf-dbus-fix-shutdown.patch
-        gsettings-schema-convert-dont-fail.patch
         gconf-merge-schema
         gconfpkg
         gconf-reload.patch
         01_xml-gettext-domain.patch)
-sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6'
-            '76c078218e7c3e93691ddd4d7fd9f5c83d4862d0a0406d17b805f3106b50375d'
-            'ddf55a40a260dd00364b32b3200bd8a76e890070ea6267fbfb322907c0946ab2'
-            'be6f084a31229e8edfd6936005c6bb4f2d1548b777df5937923b4702f7a9ac19'
+sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
             'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
 
-build() {
+prepare() {
   cd "GConf-$pkgver"
-  # Upstream fixes from git
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-shutdown.patch"
-  patch -Np1 -i "$srcdir/gsettings-schema-convert-dont-fail.patch"
-  patch -Np1 -i "$srcdir/gconf-dbus-fix-use-after-free.patch"
 
   # Patch from fedora - reloads gconf after installing schemas
   patch -Np1 -i "$srcdir/gconf-reload.patch"
@@ -46,6 +35,10 @@ build() {
 
   # Python2 fix
   sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
+}
+
+build() {
+  cd "GConf-$pkgver"
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/GConf \
@@ -61,5 +54,5 @@ package() {
 
   install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system"
   install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/"
-  install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg"
+  install -m755 "$srcdir/gconfpkg" "$pkgdir/usr/bin/gconfpkg"
 }