[arch-commits] Commit in gnome-blog/trunk (PKGBUILD gnome-blog.install)

[Jan de Groot]

    Date: Tuesday, June 15, 2010 @ 17:57:01
  Author: jgc
Revision: 82713

upgpkg: gnome-blog 0.9.2-2
Fix install scriptlet, remove pregenerated file before running configure

Modified:
  gnome-blog/trunk/PKGBUILD
  gnome-blog/trunk/gnome-blog.install

--------------------+
 PKGBUILD           |   19 ++++++++++---------
 gnome-blog.install |   23 ++++++++++-------------
 2 files changed, 20 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-15 21:32:20 UTC (rev 82712)
+++ PKGBUILD	2010-06-15 21:57:01 UTC (rev 82713)
@@ -4,7 +4,7 @@
 
 pkgname=gnome-blog
 pkgver=0.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A gnome application that allows you to post entries to many different blog formats."
 arch=('any')
 license=('GPL')
@@ -16,15 +16,16 @@
 md5sums=('39ec54600a6b8dd786729c401fcfdf27')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  rm -f GNOME_BlogApplet.server.in
   ./configure --prefix=/usr --sysconfdir=/etc \
-              --libexecdir=/usr/lib/gnome-blog \
-              --localstatedir=/var
+    --libexecdir=/usr/lib/gnome-blog \
+    --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install || return 1
 
-  install -dm755 ${pkgdir}/usr/share/gconf/schemas
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas \
-    ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
+    --domain gnome-blog ${pkgdir}/etc/gconf/schemas/*.schema || return 1
+  rm -f "${pkgdir}/etc/gconf/schemas/"*.schemas
 }

Modified: gnome-blog.install
===================================================================
--- gnome-blog.install	2010-06-15 21:32:20 UTC (rev 82712)
+++ gnome-blog.install	2010-06-15 21:57:01 UTC (rev 82713)
@@ -1,8 +1,9 @@
-pkgname=gnome-blog
+pkgname=gedit
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
@@ -14,14 +15,10 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
+
+post_remove() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}