[arch-commits] Commit in gnumeric/repos (5 files)

[Florian Pritz]

    Date: Saturday, June 2, 2012 @ 06:26:09
  Author: bluewind
Revision: 160478

db-move: moved gnumeric from [testing] to [extra] (i686)

Added:
  gnumeric/repos/extra-i686/PKGBUILD
    (from rev 160459, gnumeric/repos/testing-i686/PKGBUILD)
  gnumeric/repos/extra-i686/gnumeric.install
    (from rev 160459, gnumeric/repos/testing-i686/gnumeric.install)
Deleted:
  gnumeric/repos/extra-i686/PKGBUILD
  gnumeric/repos/extra-i686/gnumeric.install
  gnumeric/repos/testing-i686/

------------------+
 PKGBUILD         |   75 +++++++++++++++++++++++++++--------------------------
 gnumeric.install |   52 ++++++++++++++++++------------------
 2 files changed, 65 insertions(+), 62 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-06-02 10:26:08 UTC (rev 160477)
+++ extra-i686/PKGBUILD	2012-06-02 10:26:09 UTC (rev 160478)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Kritoke <typeolinux at yahoo.com>
-
-pkgname=gnumeric
-pkgver=1.10.17
-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'
-            'psiconv: for Psion 5 file support'
-            'yelp: for viewing the help manual')
-install=gnumeric.install
-options=('libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-schemas-install --enable-ssindex
-  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"
-}

Copied: gnumeric/repos/extra-i686/PKGBUILD (from rev 160459, gnumeric/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-06-02 10:26:09 UTC (rev 160478)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Kritoke <typeolinux at yahoo.com>
+
+pkgname=gnumeric
+pkgver=1.10.17
+pkgrel=2
+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'
+            'psiconv: for Psion 5 file support'
+            'yelp: for viewing the help manual')
+install=gnumeric.install
+options=('libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('8f105a10dc0dd47e14df2879591d2f28482fd03809fa95977dd4d1470a02f963')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # Remove invalid mime type. (FS#26338)
+  sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+    --disable-schemas-install --enable-ssindex
+  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"
+}

Deleted: extra-i686/gnumeric.install
===================================================================
--- extra-i686/gnumeric.install	2012-06-02 10:26:08 UTC (rev 160477)
+++ extra-i686/gnumeric.install	2012-06-02 10:26:09 UTC (rev 160478)
@@ -1,26 +0,0 @@
-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
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-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
-}

Copied: gnumeric/repos/extra-i686/gnumeric.install (from rev 160459, gnumeric/repos/testing-i686/gnumeric.install)
===================================================================
--- extra-i686/gnumeric.install	                        (rev 0)
+++ extra-i686/gnumeric.install	2012-06-02 10:26:09 UTC (rev 160478)
@@ -0,0 +1,26 @@
+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
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+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
+}