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

[Jan de Groot]

    Date: Sunday, October 12, 2008 @ 12:39:24
  Author: jgc
Revision: 15105

upgpkg: rhythmbox 0.11.6-2

Modified:
  rhythmbox/trunk/PKGBUILD
  rhythmbox/trunk/rhythmbox.install

-------------------+
 PKGBUILD          |   30 +++++++++++++++---------------
 rhythmbox.install |   11 -----------
 2 files changed, 15 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-12 16:35:52 UTC (rev 15104)
+++ PKGBUILD	2008-10-12 16:39:24 UTC (rev 15105)
@@ -3,25 +3,28 @@
  
 pkgname=rhythmbox
 pkgver=0.11.6
-pkgrel=1
+pkgrel=2
 pkgdesc="An iTunes-like music player/libary"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.rhythmbox.org"
-depends=( 'libgpod>=0.6.0' 'libsoup>=2.4.1' 'gnome-media>=2.22.0'
-          'totem-plparser>=2.22.3' 'musicbrainz>=2.1.5'
-	  'libsexy>=0.1.11' 'nautilus-cd-burner>=2.22.1' 'libmtp>=0.2.4'
-	  'lirc-utils' 'desktop-file-utils' 'gnome-python>=2.22.1'
-	  'gstreamer0.10-python>=0.10.12' 'gstreamer0.10-base-plugins'
+depends=( 'libgpod>=0.6.0' 'libsoup>=2.24.0' 'gnome-media>=2.24.0'
+          'totem-plparser>=2.24.1' 'musicbrainz>=2.1.5'
+	  'libsexy>=0.1.11' 'nautilus-cd-burner>=2.24.0' 'libmtp>=0.2.4'
+	  'lirc-utils' 'desktop-file-utils' 'gnome-python>=2.22.3'
+	  'gstreamer0.10-python>=0.10.13' 'gstreamer0.10-base-plugins'
 	  'gstreamer0.10-good-plugins')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'xulrunner>=1.9') 
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.14.0' 'xulrunner>=1.9.0.3') 
+optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+	    'gstreamer0.10-ffmpeg: Extra media codecs')
 options=('!libtool' '!emptydirs')
 install=rhythmbox.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.11/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('b827e047d13954ba956c3c4ea940935e')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --libexecdir=/usr/lib/rhythmbox \
               --localstatedir=/var --disable-static \
@@ -31,12 +34,9 @@
               --enable-python || return 1
   
   make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
   
-  install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
-  gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
-
-  # fix missing artdisplay artwork
-  #install -m 644 plugins/artdisplay/rhythmbox-missing-artwork.svg ${startdir}/pkg/usr/lib/rhythmbox/plugins/artdisplay/ || return 1
+  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Modified: rhythmbox.install
===================================================================
--- rhythmbox.install	2008-10-12 16:35:52 UTC (rev 15104)
+++ rhythmbox.install	2008-10-12 16:39:24 UTC (rev 15105)
@@ -4,17 +4,6 @@
   usr/sbin/gconfpkg --install ${pkgname}
   update-desktop-database -q
   gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-  cat << EOF
-
-==> Rhythmbox uses GStreamer to play media. By default, only plugins from
-==> gst-plugins-good and gst-plugins-base are installed.
-==>
-==> To play additional media formats, more plugins are available from
-==> gstreamer0.10-ugly-plugins, gstreamer0.10-bad-plugins 
-==> and gstreamer0.10-ffmpeg packages.
-
-EOF
-
 }
 
 pre_upgrade() {