[arch-commits] CVS update of extra/multimedia/muine (PKGBUILD muine.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:01:05
  Author: jgc
    Path: /home/cvs-extra/extra/multimedia/muine

Modified: PKGBUILD (1.16 -> 1.17) muine.install (1.8 -> 1.9)

upgpkg: muine 0.8.7-3
Move to /usr


---------------+
 PKGBUILD      |   34 +++++++++++++++-------------------
 muine.install |   14 ++++++++------
 2 files changed, 23 insertions(+), 25 deletions(-)


Index: extra/multimedia/muine/PKGBUILD
diff -u extra/multimedia/muine/PKGBUILD:1.16 extra/multimedia/muine/PKGBUILD:1.17
--- extra/multimedia/muine/PKGBUILD:1.16	Wed Mar 21 16:57:55 2007
+++ extra/multimedia/muine/PKGBUILD	Sun Apr 22 14:01:05 2007
@@ -1,49 +1,45 @@
-# $Id: PKGBUILD,v 1.16 2007/03/21 20:57:55 andyrtr Exp $
+# $Id: PKGBUILD,v 1.17 2007/04/22 18:01:05 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Ben Mazer <blm at groknil.org>
 
 pkgname=muine
 pkgver=0.8.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A music player written in C#"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.muine-player.org/"
-depends=('gnome-sharp' 'gstreamer0.10-faad>=0.10.4-2'
+depends=('gnome-sharp' 'gstreamer0.10-faad>=0.10.4-2' 'desktop-file-utils'
          'gstreamer0.10-vorbis' 'gstreamer0.10-mad' 'gstreamer0.10-flac>=0.10.5-2'
-         'gstreamer0.10-gnomevfs' 'gstreamer0.10-gconf')
+         'gstreamer0.10-gnomevfs' 'gstreamer0.10-gconf' 'libgnomeui>=2.18.1-2')
 makedepends=('perlxml' 'pkgconfig')
 options=('nolibtool')
 install=muine.install
-source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz	muine-0.8.7-flac-1.1.3.patch muine-0.8.7-64bit.patch)
+source=(http://muine-player.org/releases/muine-${pkgver}.tar.gz
+        muine-0.8.7-flac-1.1.3.patch
+	muine-0.8.7-64bit.patch)
 md5sums=('19f5aa148a7bd3c18cf1c3244813aa88' '9bbe9df2bc3860bb1ca82de3ff57e64e'\
          'f4f136f97b4e447725e36ed441c08033')
 
 build() {
-  [ -z "${GNOMEDIR}" ] && . /etc/profile.d/gnome.sh
-  if [ "$CARCH" = "x86_64" ]; then
+  if [ "${CARCH}" = "x86_64" ]; then
     patch -Np0 -i ../muine-0.8.7-64bit.patch || return 1
   fi
 
-
   export MONO_SHARED_DIR=${startdir}/src/.wabi
   mkdir -p "${MONO_SHARED_DIR}"
  
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/muine-0.8.7-flac-1.1.3.patch || return 1
-  ./configure --prefix=/opt/gnome --enable-gstreamer
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static --enable-gstreamer
   make || return 1
   make DESTDIR=${startdir}/pkg GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
 
-  install -m755 plugins/TrayIcon.{dll,xml} ${startdir}/pkg/opt/gnome/lib/muine/plugins/
-  install -m644 plugins/muine-tray-*.png ${startdir}/pkg/opt/gnome/lib/muine/plugins/
-
-  rm -rf "${MONO_SHARED_DIR}"
+  install -m755 plugins/TrayIcon.{dll,xml} ${startdir}/pkg/usr/lib/muine/plugins/
+  install -m644 plugins/muine-tray-*.png ${startdir}/pkg/usr/lib/muine/plugins/
 
-  mkdir -p ${startdir}/pkg/opt/gnome/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/opt/gnome/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  rm -f ${startdir}/pkg/opt/gnome/etc/gconf/schemas/*.schemas
-  
-  mkdir -p ${startdir}/pkg/usr/share
-  mv ${startdir}/pkg/opt/gnome/share/icons ${startdir}/pkg/usr/share/
+  mkdir -p ${startdir}/pkg/usr/share/gconf/schemas
+  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas
+  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
 }
Index: extra/multimedia/muine/muine.install
diff -u extra/multimedia/muine/muine.install:1.8 extra/multimedia/muine/muine.install:1.9
--- extra/multimedia/muine/muine.install:1.8	Sun Dec 31 07:40:54 2006
+++ extra/multimedia/muine/muine.install	Sun Apr 22 14:01:05 2007
@@ -1,11 +1,11 @@
 pkgname=muine
 
 post_install() {
-  GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-    opt/gnome/bin/gconftool-2 --makefile-install-rule opt/gnome/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+    usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
 
   update-desktop-database -q
-  gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor
+  gtk-update-icon-cache -f -t -q usr/share/icons/hicolor
 
   cat << _EOF
 
@@ -26,13 +26,15 @@
 }
 
 pre_remove() {
-  if [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
+  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
+    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
+  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
     schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
   else
     schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
   fi
-  GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` \
-    opt/gnome/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` \
+    usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
 }
 
 post_remove() {