From 83a318800db22408628e60c9e1730578efcfee37 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 1 Nov 2012 01:47:44 -0700
Subject: Thu Nov  1 01:47:04 PDT 2012

---
 extra/libcanberra/PKGBUILD            | 17 +++++++----------
 extra/libcanberra/libcanberra.install | 22 ++--------------------
 2 files changed, 9 insertions(+), 30 deletions(-)

(limited to 'extra/libcanberra')

diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index f4f54557c..c9897a6ab 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 160365 2012-06-01 12:58:34Z dreisner $
+# $Id: PKGBUILD 170059 2012-10-31 10:33:15Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.28
-pkgrel=5
+pkgver=0.30
+pkgrel=1
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
+makedepends=('gtk-doc' 'libpulse' 'gstreamer' 'gtk2' 'gtk3')
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
+source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.xz
         libcanberra.xinit)
-sha256sums=('eb1f8b2cabad7f07b6e44d606a91d73e1efca4b46daf92bd553e7222bc68868c'
+sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
             '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
 build() {
@@ -36,9 +36,6 @@ package_libcanberra() {
   rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
   rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
 
-  install -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
-
   install -D "${srcdir}/libcanberra.xinit" \
     "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
 
@@ -61,7 +58,7 @@ package_libcanberra-pulse() {
 
 package_libcanberra-gstreamer() {
   pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
+  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
diff --git a/extra/libcanberra/libcanberra.install b/extra/libcanberra/libcanberra.install
index 7f5012199..6027540fd 100644
--- a/extra/libcanberra/libcanberra.install
+++ b/extra/libcanberra/libcanberra.install
@@ -1,23 +1,5 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
 pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
+  if [ -f usr/share/gconf/schemas/libcanberra.schemas ] && [ -x usr/sbin/gconfpkg ]; then
+    usr/sbin/gconfpkg --uninstall libcanberra
   fi
 }
-- 
cgit v1.2.3-54-g00ecf