This commit was manufactured by cvs2git to create tag 'auto-ac-rhythmbox-

0_9_4_1-7'.

Sprout from unlabeled-1.1.2 2006-05-17 17:37:29 UTC Jan Rękorajski <baggins@pld-linux.org> '- properly check libnotify version'
Cherrypick from master 2005-08-28 01:36:47 UTC aredridel <aredridel@pld-linux.org> '- added':
    rhythmbox-gtk2.8-crash.patch -> 1.1
Cherrypick from unlabeled-1.2.2 2006-05-17 14:34:02 UTC Jan Rękorajski <baggins@pld-linux.org> '- from HEAD':
    rhythmbox-broken_locale.patch -> 1.2.2.1
Cherrypick from unlabeled-1.5.2 2006-02-08 17:17:53 UTC freetz <freetz@pld-linux.org> '- copied from HEAD':
    rhythmbox-desktop.patch -> 1.5.2.1
Cherrypick from unlabeled-1.52.2 2006-06-02 17:10:35 UTC freetz <freetz@pld-linux.org> '- force gstreamer versions (less buggy), updated banner, rel.7':
    rhythmbox.spec -> 1.52.2.8
Delete:
    rhythmbox-locale-names.patch
    rhythmbox-vorbis.patch

diff --git a/rhythmbox-broken_locale.patch b/rhythmbox-broken_locale.patch
index 41868986f4d7aa003c962cbe1d73e88945b9f530..bac0ebb5205747f3b9a861b79f2c6c795fd90c5f 100644 (file)
--- a/rhythmbox-broken_locale.patch
+++ b/rhythmbox-broken_locale.patch
@@ -1,12 +1,10 @@
-diff -aurN rhythmbox-0.9.1.orig/configure.ac rhythmbox-0.9.1/configure.ac
---- rhythmbox-0.9.1.orig/configure.ac  2005-10-16 11:50:21.000000000 +0200
-+++ rhythmbox-0.9.1/configure.ac       2005-10-17 11:03:13.000000000 +0200
-@@ -401,7 +401,7 @@
- AC_SUBST(RHYTHMBOX_CFLAGS)
- AC_SUBST(RHYTHMBOX_LIBS)
+diff -aurN rhythmbox-0.9.4.orig/po/LINGUAS rhythmbox-0.9.4/po/LINGUAS
+--- rhythmbox-0.9.4.orig/po/LINGUAS    2006-04-16 00:34:49.000000000 +0200
++++ rhythmbox-0.9.4/po/LINGUAS 2006-04-16 12:37:36.549110688 +0200
+@@ -2,5 +2,5 @@
+ #
+ # please keep this list sorted alphabetically
+ #
+-am ar az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml mn ms nb ne nl no pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_HK zh_TW
++am az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml ms nb ne nl no pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_HK zh_TW
  
--ALL_LINGUAS="am ar az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml mn ms nb ne nl no pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_TW"
-+ALL_LINGUAS="am az be bg ca cs cy da de el en_CA en_GB es et eu fi fr ga gl he hr hu id is it ja ko lt lv mk ml ms nb ne nl no pa pl pt pt_BR ro ru rw sk sr sr@Latn sv th tr uk vi zh_CN zh_TW"
- 
- GETTEXT_PACKAGE=rhythmbox
- AC_SUBST(GETTEXT_PACKAGE)

diff --git a/rhythmbox-desktop.patch b/rhythmbox-desktop.patch
new file mode 100644 (file)
index 0000000..c2771c1
--- /dev/null
+++ b/rhythmbox-desktop.patch
@@ -0,0 +1,12 @@
+diff -aurN rhythmbox-0.9.3.orig/data/rhythmbox.desktop.in rhythmbox-0.9.3/data/rhythmbox.desktop.in
+--- rhythmbox-0.9.3.orig/data/rhythmbox.desktop.in     2006-01-24 07:51:58.000000000 +0100
++++ rhythmbox-0.9.3/data/rhythmbox.desktop.in  2006-02-02 14:29:52.744276000 +0100
+@@ -8,7 +8,7 @@
+ Type=Application
+ Icon=rhythmbox.png
+ X-GNOME-DocPath=rhythmbox/rhythmbox.xml
+-Categories=GNOME;GTK;Application;AudioVideo;X-Ximian-Main;X-Red-Hat-Base;
++Categories=GTK;GNOME;AudioVideo;Audio;Player;
+ MimeType=application/x-ogg;application/ogg;audio/x-mp3;audio/x-scpls;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-mpegurl;application/x-flac
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME

diff --git a/rhythmbox-gtk2.8-crash.patch b/rhythmbox-gtk2.8-crash.patch
new file mode 100644 (file)
index 0000000..37a8fb6
--- /dev/null
+++ b/rhythmbox-gtk2.8-crash.patch
@@ -0,0 +1,12 @@
+diff -ur rhythmbox-0.9.0-o/shell/main.c rhythmbox-0.9.0/shell/main.c
+--- rhythmbox-0.9.0-o/shell/main.c     2005-08-10 07:23:28.000000000 -0600
++++ rhythmbox-0.9.0/shell/main.c       2005-08-27 19:14:43.000000000 -0600
+@@ -166,6 +166,8 @@
+               = (void *) gst_init_get_popt_table ();
+ #endif
+ 
++      gtk_init(NULL, NULL);
++
+       gtk_set_locale ();
+       program = gnome_program_init (PACKAGE, VERSION,
+                                     LIBGNOMEUI_MODULE, argc+1, new_argv,

diff --git a/rhythmbox-locale-names.patch b/rhythmbox-locale-names.patch
deleted file mode 100644 (file)
index 119153d..0000000
--- a/rhythmbox-locale-names.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN rhythmbox-0.7.1.orig/configure.ac rhythmbox-0.7.1/configure.ac
---- rhythmbox-0.7.1.orig/configure.ac  2004-03-17 07:33:42.169961136 +0100
-+++ rhythmbox-0.7.1/configure.ac       2004-03-17 07:34:02.657846504 +0100
-@@ -454,7 +454,7 @@
- AC_SUBST(RHYTHMBOX_CFLAGS)
- AC_SUBST(RHYTHMBOX_LIBS)
- 
--ALL_LINGUAS="am ar az be bg ca cs cy da de el es et fi fr ga hr hu id it ja ko lt lv mn ms nl no pl pt pt_BR ro ru sr sr@Latn sv tr uk vi zh_TW"
-+ALL_LINGUAS="am ar az be bg ca cs cy da de el es et fi fr ga hr hu id it ja ko lt lv mn ms nb nl pl pt pt_BR ro ru sr sr@Latn sv tr uk vi zh_TW"
- 
- GETTEXT_PACKAGE=rhythmbox
- AC_SUBST(GETTEXT_PACKAGE)

diff --git a/rhythmbox-vorbis.patch b/rhythmbox-vorbis.patch
deleted file mode 100644 (file)
index 823f1f2..0000000
--- a/rhythmbox-vorbis.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN aa/rhythmbox-0.7.0/configure.ac rhythmbox-0.7.0/configure.ac
---- aa/rhythmbox-0.7.0/configure.ac    2004-02-05 17:05:10.000000000 +0100
-+++ rhythmbox-0.7.0/configure.ac       2004-03-10 17:59:59.731181480 +0100
-@@ -270,9 +270,9 @@
-                               [don't build with Ogg Vorbis support]))
- if test x"$with_metadata" = xmonkeymedia; then
- if test x"$enable_vorbis" != xno; then
--  MM_PATH_OGG(enable_vorbis=yes,enable_vorbis=no)
-+  XIPH_PATH_OGG(enable_vorbis=yes,enable_vorbis=no)
-   if test x"$enable_vorbis" = xyes; then
--    MM_PATH_VORBIS(,enable_vorbis=no)
-+    XIPH_PATH_VORBIS(,enable_vorbis=no)
-   fi
-   if test x"$enable_vorbis" = xyes; then
-     if test x"$have_gstreamer" = xyes; then

diff --git a/rhythmbox.spec b/rhythmbox.spec
new file mode 100644 (file)
index 0000000..6b66f85
--- /dev/null
+++ b/rhythmbox.spec
@@ -0,0 +1,164 @@
+#
+# Conditional build:
+%bcond_without ipod    # build without iPod support
+#
+Summary:       Music Management Application
+Summary(pl):   Aplikacja do zarz±dzania muzyk±
+Name:          rhythmbox
+Version:       0.9.4.1
+Release:       7
+License:       GPL v2+
+Group:         Applications
+Source0:       http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
+# Source0-md5: d725eb7134d1997efe28285715ebc05e
+Patch0:                %{name}-desktop.patch
+Patch1:                %{name}-broken_locale.patch
+Patch2:                %{name}-gtk2.8-crash.patch
+Patch3:                %{name}-pyc.patch
+Patch4:                %{name}-use-icon-name.patch
+URL:           http://www.rhythmbox.org/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: avahi-glib-devel
+BuildRequires: dbus-glib-devel >= 0.60
+BuildRequires: gnome-vfs2-devel >= 2.14.0
+BuildRequires: gstreamer-devel >= 0.10.2
+BuildRequires: gstreamer-GConf >= 0.10
+BuildRequires: gstreamer-plugins-base-devel >= 0.10
+BuildRequires: gtk+2-devel >= 2:2.8.0
+BuildRequires: hal-devel >= 0.5.4
+BuildRequires: intltool
+BuildRequires: libbonobo-devel >= 2.14.0
+BuildRequires: libglade2-devel >= 1:2.5.1
+BuildRequires: libgnomeui-devel >= 2.14.0
+%{?with_ipod:BuildRequires:    libgpod-devel >= 0.3.0}
+BuildRequires: libmusicbrainz-devel >= 2.0.1
+BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libsexy-devel >= 0.1.5
+BuildRequires: libsoup-devel
+BuildRequires: libtool
+BuildRequires: nautilus-cd-burner-devel >= 2.14.0.1-2
+BuildRequires: pkgconfig
+BuildRequires: python-pygtk-devel >= 2.6.0
+BuildRequires: rpmbuild(macros) >= 1.176
+BuildRequires: scrollkeeper
+BuildRequires: totem-devel >= 1.1.3
+BuildRequires: zlib-devel
+%pyrequires_eq python-modules
+Requires(post,preun):  GConf2
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): scrollkeeper
+Requires:      dbus >= 0.60
+Requires:      gstreamer-audio-effects-base >= 0.10
+Requires:      gstreamer-plugins-good >= 0.10.3
+Requires:      gstreamer-audio-formats >= 0.10.3
+Requires:      gstreamer-audiosink
+Requires:      gstreamer-gnomevfs >= 0.10
+Requires:      gtk+2 >= 2:2.6.3
+Requires:      libgnomeui >= 2.14.1
+Obsoletes:     net-rhythmbox
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+Rhythmbox is your one-stop multimedia application, supporting a music
+library, multiple "music groups", internet radio, and more.
+
+%description -l pl
+Rhythmbox to kompletna aplikacja multimedialna, obs³uguj±ca bibliotekê
+muzyczn±, wiele "grup muzyki", radio internetowe itp.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+# broken
+rm po/{ar,mn}.po
+
+%build
+%{__intltoolize}
+%{__glib_gettextize}
+%{__libtoolize}
+%{__aclocal} -I macros
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure \
+       --disable-schemas-install \
+       --disable-scrollkeeper \
+       --with-bonobo \
+       --with-cd-burner \
+       --with-dbus \
+       %{!?with_ipod:--without-ipod} \
+       --with-mds=avahi \
+       --with-internal-libsexy=no
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
+# there is no -devel subpackage, so we don't need APIdocs
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc
+
+%find_lang %{name} --with-gnome --all-name
+
+rm -f  $RPM_BUILD_ROOT%{_libdir}/bonobo/lib*.{la,a}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/rhythmbox/plugins/*.{a,la,py}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%gconf_schema_install rhythmbox.schemas
+%scrollkeeper_update_post
+%update_desktop_database_post
+%banner %{name} -e << EOF
+Remember to install appropriate GStreamer plugins for files
+you want to play:
+- gstreamer-flac (for FLAC)
+- gstreamer-mad (for MP3s)
+- gstreamer-vorbis (for Ogg Vorbis)
+- gstreamer-neon (for HTTP streams)
+
+EOF
+
+%postun 
+%scrollkeeper_update_postun
+%update_desktop_database_postun
+
+%preun
+%gconf_schema_uninstall rhythmbox.schemas
+
+%files -f rhythmbox.lang
+%defattr(644,root,root,755)
+%doc AUTHORS ChangeLog README NEWS
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/bonobo/*.so
+%attr(755,root,root) %{_libdir}/rhythmbox-metadata
+
+%dir %{_libdir}/rhythmbox
+%dir %{_libdir}/rhythmbox/plugins
+%attr(755,root,root) %{_libdir}/rhythmbox/plugins/*.so
+%{_libdir}/rhythmbox/plugins/*-plugin
+%{_libdir}/rhythmbox/plugins/*.py[co]
+
+%{_datadir}/idl/*
+%{_datadir}/%{name}
+%{_datadir}/dbus-1/services/*.service
+%{_desktopdir}/*
+%{_libdir}/bonobo/servers/*
+%{_omf_dest_dir}/%{name}
+%{_pixmapsdir}/*
+%{_pkgconfigdir}/*
+%{_sysconfdir}/gconf/schemas/rhythmbox.schemas