[arch-commits] Commit in gnome-control-center/trunk (2 files)

[Ionut Biru]

    Date: Wednesday, April 27, 2011 @ 04:37:19
  Author: ibiru
Revision: 120905

update to 3.0.1.1, drop gconf, add sound theme

Modified:
  gnome-control-center/trunk/PKGBUILD
  gnome-control-center/trunk/gnome-control-center.install

------------------------------+
 PKGBUILD                     |   12 ++++--------
 gnome-control-center.install |   13 +++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-27 08:07:11 UTC (rev 120904)
+++ PKGBUILD	2011-04-27 08:37:19 UTC (rev 120905)
@@ -2,11 +2,11 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.0.1
+pkgver=3.0.1.1
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice')
+depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop')
 optdepends=('mesa-demos: provides glxinfo for graphics information'
             'apg: adds password generation for user accounts')
 makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
@@ -16,7 +16,7 @@
 license=('GPL')
 options=('!libtool' '!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('90dde4b3db8b7a9c973f71e15601fd176ad6746cfef63c818fbdfd2254a8e99f')
+sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,10 +29,6 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  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 gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }
 

Modified: gnome-control-center.install
===================================================================
--- gnome-control-center.install	2011-04-27 08:07:11 UTC (rev 120904)
+++ gnome-control-center.install	2011-04-27 08:37:19 UTC (rev 120905)
@@ -1,18 +1,19 @@
 pkgname=gnome-control-center
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+        usr/sbin/gconfpkg --uninstall ${pkgname}
+    fi
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+post_upgrade() {
+    post_install $1
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    post_install $1
 }