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

[Ionut Biru]

    Date: Monday, April 23, 2012 @ 05:08:14
  Author: ibiru
Revision: 156882

db-move: moved gucharmap from [testing] to [extra] (x86_64)

Added:
  gucharmap/repos/extra-x86_64/PKGBUILD
    (from rev 156695, gucharmap/repos/testing-x86_64/PKGBUILD)
  gucharmap/repos/extra-x86_64/gucharmap.install
    (from rev 156695, gucharmap/repos/testing-x86_64/gucharmap.install)
Deleted:
  gucharmap/repos/extra-x86_64/PKGBUILD
  gucharmap/repos/extra-x86_64/gucharmap.install
  gucharmap/repos/testing-x86_64/

-------------------+
 PKGBUILD          |   63 ++++++++++++++++++++++++----------------------------
 gucharmap.install |   39 ++++++++++++++------------------
 2 files changed, 47 insertions(+), 55 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-23 09:08:13 UTC (rev 156881)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:08:14 UTC (rev 156882)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Jan De Groot <jgc at archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.2.2
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('gconf' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('da1e422d387ff4df8bfb61e8a340483f88b0d23e4309a776848dbeb4093a5a21')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper  --enable-introspection
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 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 gucharmap $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f $pkgdir/etc/gconf/schemas/*.schemas
-}

Copied: gucharmap/repos/extra-x86_64/PKGBUILD (from rev 156695, gucharmap/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-23 09:08:14 UTC (rev 156882)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Jan De Groot <jgc at archlinux.org>
+
+pkgname=gucharmap
+pkgver=3.4.1.1
+pkgrel=1
+pkgdesc="Gnome Unicode Charmap"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://www.gnome.org"
+depends=('dconf' 'gtk3' 'hicolor-icon-theme')
+makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
+options=('!libtool' '!emptydirs')
+install=gucharmap.install
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --disable-schemas-compile  --enable-introspection
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/gucharmap.install
===================================================================
--- extra-x86_64/gucharmap.install	2012-04-23 09:08:13 UTC (rev 156881)
+++ extra-x86_64/gucharmap.install	2012-04-23 09:08:14 UTC (rev 156882)
@@ -1,22 +0,0 @@
-pkgname=gucharmap
-
-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
-}

Copied: gucharmap/repos/extra-x86_64/gucharmap.install (from rev 156695, gucharmap/repos/testing-x86_64/gucharmap.install)
===================================================================
--- extra-x86_64/gucharmap.install	                        (rev 0)
+++ extra-x86_64/gucharmap.install	2012-04-23 09:08:14 UTC (rev 156882)
@@ -0,0 +1,17 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
+  return 0
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}