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

[Jan de Groot]

    Date: Wednesday, December 19, 2012 @ 08:19:48
  Author: jgc
Revision: 173333

GTK3 port. Adjust dependencies. Drop gconf

upgpkg: gnumeric 1.12.0-1

Modified:
  gnumeric/trunk/PKGBUILD
  gnumeric/trunk/gnumeric.install

------------------+
 PKGBUILD         |   21 +++++++++------------
 gnumeric.install |   17 +++++------------
 2 files changed, 14 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-19 13:19:41 UTC (rev 173332)
+++ PKGBUILD	2012-12-19 13:19:48 UTC (rev 173333)
@@ -3,21 +3,22 @@
 # Contributor: Kritoke <typeolinux at yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.10.17
-pkgrel=2
+pkgver=1.12.0
+pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
-depends=('goffice' 'gconf' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gnome-doc-utils' 'pygobject' 'psiconv')
-optdepends=('pygobject: for python plugin support'
+depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils')
+optdepends=('python2-gobject: for python plugin support'
+            'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
-options=('libtool')
+options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963')
+sha256sums=('037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -25,15 +26,11 @@
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-schemas-install --enable-ssindex
+    --enable-ssindex --disable-schemas-compile
   make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnumeric "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}/etc/gconf"
 }

Modified: gnumeric.install
===================================================================
--- gnumeric.install	2012-12-19 13:19:41 UTC (rev 173332)
+++ gnumeric.install	2012-12-19 13:19:48 UTC (rev 173333)
@@ -1,26 +1,19 @@
-pkgname=gnumeric
-
 post_install() {
   usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
   update-desktop-database -q
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f usr/share/gconf/schemas/gnumeric.schemas ]; then
+    usr/sbin/gconfpkg --uninstall gnumeric
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor	
-  update-desktop-database -q
+  post_install
 }