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

[Ionut Biru]

    Date: Saturday, March 10, 2012 @ 13:51:12
  Author: ibiru
Revision: 152941

upstream split this package in standalone applications
this package is just for easy upgrade path

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

---------------------+
 PKGBUILD            |   38 ++++----------------------------------
 gnome-utils.install |   24 +++---------------------
 2 files changed, 7 insertions(+), 55 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-10 18:42:10 UTC (rev 152940)
+++ PKGBUILD	2012-03-10 18:51:12 UTC (rev 152941)
@@ -2,40 +2,10 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-utils
-pkgver=3.2.1
+pkgver=3.4.0
 pkgrel=1
-pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
+pkgdesc="Meta package"
+arch=(any)
+depends=(baobab gnome-dictionary gnome-font-viewer gnome-screenshot gnome-search-tool gnome-system-log)
 install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3ac1942dbf4d9d394e2fcc5f30a4480b1b1e5d44ee0c2d4f61689f4a221ba328')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gnome-utils \
-        --localstatedir=/var --disable-static \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  # remove it also from Xfce menu that ships its own thingy
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
-}

Modified: gnome-utils.install
===================================================================
--- gnome-utils.install	2012-03-10 18:42:10 UTC (rev 152940)
+++ gnome-utils.install	2012-03-10 18:51:12 UTC (rev 152941)
@@ -1,26 +1,8 @@
 pkgname=gnome-utils
 
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  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
-}
 
 pre_upgrade() {
-  pre_remove $1
+    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
+        /usr/sbin/gconfpkg --uninstall $pkgname
+    fi
 }
-
-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
-}