diff options
| author | root <root@rshg047.dnsready.net> | 2011-04-28 22:32:07 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-04-28 22:32:07 +0000 |
| commit | 19f42937be8f6619a85663cb71e24c05b7e8b6d2 (patch) | |
| tree | e7d059bcc0b5c309ff565da9be68ade7f29ef5fc /testing/gnome-control-center | |
| parent | 8784d3134c1d4b4c02d705259ae2ebd768c778fd (diff) | |
Thu Apr 28 22:32:07 UTC 2011
Diffstat (limited to 'testing/gnome-control-center')
| -rw-r--r-- | testing/gnome-control-center/PKGBUILD | 14 | ||||
| -rw-r--r-- | testing/gnome-control-center/gnome-control-center.install | 13 |
2 files changed, 12 insertions, 15 deletions
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 6b8d4b321..97f803ce8 100644 --- a/testing/gnome-control-center/PKGBUILD +++ b/testing/gnome-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 120752 2011-04-26 11:03:14Z heftig $ +# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $ # Maintainer: Jan de Groot <jgc@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 @@ install=gnome-control-center.install 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 @@ build() { 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 } diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install index 8f0bc46fb..eb703319f 100644 --- a/testing/gnome-control-center/gnome-control-center.install +++ b/testing/gnome-control-center/gnome-control-center.install @@ -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 } |