Update to 0.9.6.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7683 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 120 insertions, 124 deletions

diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 9f9c0e141..93e65391a 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,19 +3,18 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.64 2006/07/21 20:46:53 mezz Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.65 2006/10/07 17:10:03 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.5
-PORTREVISION=	3
+PORTVERSION=	0.9.6
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Audio player for the Gnome 2 desktop environment
+COMMENT=	Audio player for the GNOME 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
@@ -42,11 +41,11 @@ CONFIGURE_ENV=	LIBS="-lm" \
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
-OPTIONS=	IPOD "Enable iPod support" off \
-		DAAP "Enable iTunes music sharing" off \
+OPTIONS=	DAAP "Enable iTunes music sharing" off \
 		FAAD "Enable FAAD decoder support" off \
 		NOTIFY "Enable libnotify support" on \
-		VORBIS "Enable Ogg/Vorbis support" on
+		VORBIS "Enable Ogg/Vorbis support" on \
+		GDA "Enable GDA database storage" off
 
 .include <bsd.port.pre.mk>
 
@@ -54,10 +53,6 @@ OPTIONS=	IPOD "Enable iPod support" off \
 BROKEN=	Does not build on 4.X
 .endif
 
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+=	--enable-ipod
-.endif
-
 .if !defined(WITHOUT_VORBIS)
 USE_GSTREAMER+=		vorbis
 .else
@@ -68,6 +63,13 @@ CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 USE_GSTREAMER+=		faad
 .endif
 
+.if defined(WITH_GDA)
+USE_GNOME+=	libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
 .if defined(WITH_DAAP)
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		 avahi-client:${PORTSDIR}/net/avahi
diff --git a/audio/rhythmbox-devel/distinfo b/audio/rhythmbox-devel/distinfo
index 8b33c6d1a..f05070cb9 100644
--- a/audio/rhythmbox-devel/distinfo
+++ b/audio/rhythmbox-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c
deleted file mode 100644
index 7f5c4ed05..000000000
--- a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-client.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-dbus-client.c.orig	Sat Oct  7 22:33:37 2006
-+++ metadata/rb-metadata-dbus-client.c	Sat Oct  7 22:33:48 2006
-@@ -118,7 +118,7 @@ kill_metadata_service (void)
- 	if (dbus_connection) {
- 		if (dbus_connection_get_is_connected (dbus_connection)) {
- 			rb_debug ("closing dbus connection");
--			dbus_connection_disconnect (dbus_connection);
-+			dbus_connection_close (dbus_connection);
- 		} else {
- 			rb_debug ("dbus connection already closed");
- 		}
diff --git a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-service.c b/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-service.c
deleted file mode 100644
index 3dc8c4fa8..000000000
--- a/audio/rhythmbox-devel/files/patch-metadata_rb-metadata-dbus-service.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-dbus-service.c.orig	Sat Oct  7 21:25:45 2006
-+++ metadata/rb-metadata-dbus-service.c	Sat Oct  7 21:25:56 2006
-@@ -494,7 +494,7 @@ main (int argc, char **argv)
- 	g_main_loop_run (svc.loop);
- 
- 	if (svc.connection) {
--		dbus_connection_disconnect (svc.connection);
-+		dbus_connection_close (svc.connection);
- 		dbus_connection_unref (svc.connection);
- 	}
- 
diff --git a/audio/rhythmbox-devel/pkg-plist b/audio/rhythmbox-devel/pkg-plist
index 63ee6e02f..7a1f7c01a 100644
--- a/audio/rhythmbox-devel/pkg-plist
+++ b/audio/rhythmbox-devel/pkg-plist
@@ -1,37 +1,51 @@
 bin/rhythmbox
 bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
 libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/ch01.html
@@ -110,7 +124,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
 share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +211,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
 share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
 share/gnome/omf/rhythmbox/rhythmbox-es.omf
 share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -310,7 +322,13 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 9f9c0e141..93e65391a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,19 +3,18 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.64 2006/07/21 20:46:53 mezz Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.65 2006/10/07 17:10:03 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.9.5
-PORTREVISION=	3
+PORTVERSION=	0.9.6
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	marcus@FreeBSD.org
-COMMENT=	Audio player for the Gnome 2 desktop environment
+COMMENT=	Audio player for the GNOME 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
@@ -42,11 +41,11 @@ CONFIGURE_ENV=	LIBS="-lm" \
 
 GCONF_SCHEMAS=	rhythmbox.schemas
 
-OPTIONS=	IPOD "Enable iPod support" off \
-		DAAP "Enable iTunes music sharing" off \
+OPTIONS=	DAAP "Enable iTunes music sharing" off \
 		FAAD "Enable FAAD decoder support" off \
 		NOTIFY "Enable libnotify support" on \
-		VORBIS "Enable Ogg/Vorbis support" on
+		VORBIS "Enable Ogg/Vorbis support" on \
+		GDA "Enable GDA database storage" off
 
 .include <bsd.port.pre.mk>
 
@@ -54,10 +53,6 @@ OPTIONS=	IPOD "Enable iPod support" off \
 BROKEN=	Does not build on 4.X
 .endif
 
-.ifdef (WITH_IPOD)
-CONFIGURE_ARGS+=	--enable-ipod
-.endif
-
 .if !defined(WITHOUT_VORBIS)
 USE_GSTREAMER+=		vorbis
 .else
@@ -68,6 +63,13 @@ CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 USE_GSTREAMER+=		faad
 .endif
 
+.if defined(WITH_GDA)
+USE_GNOME+=	libgda2
+CONFIGURE_ARGS+=--with-database=libgda
+.else
+CONFIGURE_ARGS+=--with-database=tree
+.endif
+
 .if defined(WITH_DAAP)
 CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		 avahi-client:${PORTSDIR}/net/avahi
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 8b33c6d1a..f05070cb9 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.9.5.tar.bz2) = ff55e1db114321b7bdd6e21df1879367
-SHA256 (gnome2/rhythmbox-0.9.5.tar.bz2) = 63607430da44df029b9b82d43cea887b0217c2e058432be65e5a3b5fa8baba43
-SIZE (gnome2/rhythmbox-0.9.5.tar.bz2) = 2429543
+MD5 (gnome2/rhythmbox-0.9.6.tar.bz2) = 805459eafd670b18c663ba478ad2ebd4
+SHA256 (gnome2/rhythmbox-0.9.6.tar.bz2) = fe73b49d9008a9b487c93b5d4d99aa34350b87fde2c0978a6f126fdef3126973
+SIZE (gnome2/rhythmbox-0.9.6.tar.bz2) = 3129839
diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
deleted file mode 100644
index 7f5c4ed05..000000000
--- a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-client.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-dbus-client.c.orig	Sat Oct  7 22:33:37 2006
-+++ metadata/rb-metadata-dbus-client.c	Sat Oct  7 22:33:48 2006
-@@ -118,7 +118,7 @@ kill_metadata_service (void)
- 	if (dbus_connection) {
- 		if (dbus_connection_get_is_connected (dbus_connection)) {
- 			rb_debug ("closing dbus connection");
--			dbus_connection_disconnect (dbus_connection);
-+			dbus_connection_close (dbus_connection);
- 		} else {
- 			rb_debug ("dbus connection already closed");
- 		}
diff --git a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-service.c b/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-service.c
deleted file mode 100644
index 3dc8c4fa8..000000000
--- a/audio/rhythmbox/files/patch-metadata_rb-metadata-dbus-service.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- metadata/rb-metadata-dbus-service.c.orig	Sat Oct  7 21:25:45 2006
-+++ metadata/rb-metadata-dbus-service.c	Sat Oct  7 21:25:56 2006
-@@ -494,7 +494,7 @@ main (int argc, char **argv)
- 	g_main_loop_run (svc.loop);
- 
- 	if (svc.connection) {
--		dbus_connection_disconnect (svc.connection);
-+		dbus_connection_close (svc.connection);
- 		dbus_connection_unref (svc.connection);
- 	}
- 
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 63ee6e02f..7a1f7c01a 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -1,37 +1,51 @@
 bin/rhythmbox
 bin/rhythmbox-client
-%%PYTHON%%lib/rhythmbox/plugins/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/Loader.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/__init__.pyo
-lib/rhythmbox/plugins/audioscrobbler.rb-plugin
-lib/rhythmbox/plugins/generic-player.rb-plugin
-lib/rhythmbox/plugins/libaudioscrobbler.a
-lib/rhythmbox/plugins/libaudioscrobbler.la
-lib/rhythmbox/plugins/libaudioscrobbler.so
-lib/rhythmbox/plugins/libgeneric-player.a
-lib/rhythmbox/plugins/libgeneric-player.la
-lib/rhythmbox/plugins/libgeneric-player.so
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.pyo
-%%PYTHON%%lib/rhythmbox/plugins/lyrics.rb-plugin
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.py
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyc
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.pyo
-%%PYTHON%%lib/rhythmbox/plugins/pythonconsole.rb-plugin
+lib/rhythmbox/plugins/audiocd.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la
+lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
+lib/rhythmbox/plugins/cd-recorder/cd-recorder.rb-plugin
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.a
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.la
+lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
+lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
+lib/rhythmbox/plugins/generic-player/libgeneric-player.a
+lib/rhythmbox/plugins/generic-player/libgeneric-player.la
+lib/rhythmbox/plugins/generic-player/libgeneric-player.so
+lib/rhythmbox/plugins/libaudiocd.a
+lib/rhythmbox/plugins/libaudiocd.la
+lib/rhythmbox/plugins/libaudiocd.so
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyc
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.pyo
+%%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/Loader.pyo
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/rb/__init__.pyo
 libexec/rhythmbox-metadata
 share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/ch01.html
@@ -110,7 +124,6 @@ share/dbus-1/services/org.gnome.Rhythmbox.service
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
-share/gnome/application-registry/rhythmbox.applications
 share/gnome/applications/rhythmbox.desktop
 share/gnome/help/rhythmbox/C/fdl-appendix.xml
 share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png
@@ -198,7 +211,6 @@ share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png
 share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml
-share/gnome/mime-info/rhythmbox.keys
 share/gnome/omf/rhythmbox/rhythmbox-C.omf
 share/gnome/omf/rhythmbox/rhythmbox-es.omf
 share/gnome/omf/rhythmbox/rhythmbox-fr.omf
@@ -310,7 +322,13 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 @dirrm share/gnome/help/rhythmbox/C
 @dirrm share/gnome/help/rhythmbox
 @dirrm %%DOCSDIR%%
-@dirrm lib/rhythmbox/plugins/artdisplay
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/lyrics
+@dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/cd-recorder
+@dirrm lib/rhythmbox/plugins/audioscrobbler
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/artdisplay
 @dirrm lib/rhythmbox/plugins
 @dirrm lib/rhythmbox
 @dirrmtry share/locale/zh_TW/LC_MESSAGES