[arch-commits] Commit in gconf-editor/trunk (PKGBUILD gconf-editor.install)

[Jan de Groot]

    Date: Thursday, August 4, 2016 @ 10:06:53
  Author: jgc
Revision: 273016

upgpkg: gconf-editor 3.0.1-4

Modified:
  gconf-editor/trunk/PKGBUILD
Deleted:
  gconf-editor/trunk/gconf-editor.install

----------------------+
 PKGBUILD             |   14 ++++++++------
 gconf-editor.install |   22 ----------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-04 08:08:19 UTC (rev 273015)
+++ PKGBUILD	2016-08-04 10:06:53 UTC (rev 273016)
@@ -3,23 +3,25 @@
 
 pkgname=gconf-editor
 pkgver=3.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Graphical gconf registry editor"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('gconf' 'hicolor-icon-theme' 'gtk3')
+depends=('gconf' 'gtk3')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 options=(!emptydirs)
-install=gconf-editor.install
 source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
         fix-assertion-failed-crash.patch)
 sha256sums=('9afc4fc0d0afe019998736f06c04cbfa0393c813e2aa755133d95e83835f8869'
             '6550714ee06d09632244d0f4f41402224599f5230ef71376ea34291ce0d651bc')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fix-assertion-failed-crash.patch
+}
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "${srcdir}/fix-assertion-failed-crash.patch"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
      --localstatedir=/var --disable-scrollkeeper
   make
@@ -26,7 +28,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
   install -m755 -d "$pkgdir/usr/share/gconf/schemas"

Deleted: gconf-editor.install
===================================================================
--- gconf-editor.install	2016-08-04 08:08:19 UTC (rev 273015)
+++ gconf-editor.install	2016-08-04 10:06:53 UTC (rev 273016)
@@ -1,22 +0,0 @@
-pkgname=gconf-editor
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}