Date: Tuesday, September 28, 2010 @ 04:24:59
  Author: ibiru
Revision: 91845

readd gconf schemas, dconf is not ready

Modified:
  evince/trunk/PKGBUILD
  evince/trunk/evince.install

----------------+
 PKGBUILD       |   10 +++++++---
 evince.install |   14 +++++++++++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2010-09-28 08:20:46 UTC (rev 91844)
+++ PKGBUILD    2010-09-28 08:24:59 UTC (rev 91845)
@@ -3,7 +3,7 @@
 
 pkgname=evince
 pkgver=2.32.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/";
 arch=('i686' 'x86_64')
@@ -29,8 +29,12 @@
       --enable-comics --enable-impress \
       --enable-introspection \
       --disable-scrollkeeper \
-      --without-gconf \
       --disable-schemas-compile
   make
-  make DESTDIR="${pkgdir}" install
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" 
--domain evince ${pkgdir}/etc/gconf/schemas/*.schemas
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+
 }

Modified: evince.install
===================================================================
--- evince.install      2010-09-28 08:20:46 UTC (rev 91844)
+++ evince.install      2010-09-28 08:24:59 UTC (rev 91845)
@@ -1,14 +1,26 @@
+pkgname=evince
+
 post_install() {
   usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
   update-desktop-database -q
 }
 
+pre_upgrade() {
+  pre_remove $1
+}
+
 post_upgrade() {
   post_install $1
 }
 
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
+}
 
 post_remove() {
-  post_install $1
+  update-desktop-database -q
+  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
 }

Reply via email to