SPECS: rhythmbox.spec - merged from DEVEL

freetz freetz at pld-linux.org
Mon Oct 17 11:27:12 CEST 2005


Author: freetz                       Date: Mon Oct 17 09:27:12 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   rhythmbox.spec (1.49 -> 1.50) 

---- Diffs:

================================================================
Index: SPECS/rhythmbox.spec
diff -u SPECS/rhythmbox.spec:1.49 SPECS/rhythmbox.spec:1.50
--- SPECS/rhythmbox.spec:1.49	Tue Apr 12 21:23:21 2005
+++ SPECS/rhythmbox.spec	Mon Oct 17 11:27:07 2005
@@ -1,57 +1,52 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	xine	# build with xine-lib instead of gstreamer
-#
 Summary:	Music Management Application
 Summary(pl):	Aplikacja do zarządzania muzyką
 Name:		rhythmbox
-Version:	0.8.8
-Release:	4
+Version:	0.9.1
+Release:	1
 License:	GPL v2+
 Group:		Applications
-Source0:	http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	46cd84b3b67f85009aa48e0e301124fe
-Patch0:		%{name}-vorbis.patch
-Patch1:		%{name}-desktop.patch
+Source0:	http://ftp.gnome.org/pub/gnome/sources/rhythmbox/0.9/%{name}-%{version}.tar.bz2
+# Source0-md5:	942b204d1227f4d66e26a289ca762df2
+Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-broken_locale.patch
+Patch2:		%{name}-gtk2.8-crash.patch
 URL:		http://www.rhythmbox.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%if %{without xine}
+BuildRequires:	dbus-glib-devel >= 0.35
 BuildRequires:	gstreamer-GConf-devel >= 0.8.8
 BuildRequires:	gstreamer-devel >= 0.8.9
 BuildRequires:	gstreamer-plugins-devel >= 0.8.8
-%else
-BuildRequires:	flac-devel
-BuildRequires:	libid3tag-devel >= 0.15.0b
-BuildRequires:	libmad-devel
-BuildRequires:	libogg-devel
-BuildRequires:	libvorbis-devel
-BuildRequires:	xine-lib-devel >= 1.0.0
-%endif
 BuildRequires:	gnome-vfs2-devel >= 2.10.0-2
-BuildRequires:	gtk+2-devel >= 2:2.6.4
+BuildRequires:	gtk+2-devel >= 2:2.8.0
+BuildRequires:	hal-devel >= 0.5.4
+BuildRequires:	howl-devel
+BuildRequires:	intltool
 BuildRequires:	libbonobo-devel >= 2.8.0
 BuildRequires:	libglade2-devel >= 1:2.5.1
 BuildRequires:	libgnomeui-devel >= 2.10.0-2
 BuildRequires:	libmusicbrainz-devel >= 2.0.1
 BuildRequires:	libtool
+BuildRequires:	nautilus-cd-burner-devel >= 2.9.0
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.176
+BuildRequires:	scrollkeeper
+BuildRequires:	totem-devel >= 1.1.3
 BuildRequires:	zlib-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,preun):	GConf2
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	scrollkeeper
-%if %{without xine}
+Requires(post,postun):	/usr/bin/scrollkeeper-update
+Requires(post,preun):	GConf2
+Requires:	dbus >= 0.35
 Requires:	gstreamer-audio-effects >= 0.8.8
 Requires:	gstreamer-audio-formats >= 0.8.8
 Requires:	gstreamer-audiosink
 Requires:	gstreamer-gnomevfs >= 0.8.8
-%else
-Requires:	xine-plugin-audio
-%endif
-Requires:	gtk+2 >= 2:2.6.4
+Requires:	gtk+2 >= 2:2.6.3
+Requires:	hal >= 0.5.4
 Obsoletes:	net-rhythmbox
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -67,17 +62,27 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+
+# broken
+rm po/{ar,mn}.po
 
 %build
+%{__intltoolize}
+%{__glib_gettextize}
 %{__libtoolize}
-%{__aclocal}
-%{__autoconf}
+%{__aclocal} -I macros
+%{__autoheader}
 %{__automake}
+%{__autoconf}
 %configure \
 	--disable-schemas-install \
-	--enable-ipod \
-	--enable-nautilus-menu \
-	%{?_with_xine:--with-player=xine}
+	--with-bonobo \
+	--with-cd-burner \
+	--with-dbus \
+	--with-ipod \
+	--with-mds=howl
+	
 %{__make}
 
 %install
@@ -92,17 +97,17 @@
 
 %find_lang %{name} --with-gnome --all-name
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/lib*.{la,a}
+rm -f  $RPM_BUILD_ROOT%{_libdir}/bonobo/lib*.{la,a}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/application-registry
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/ldconfig
 %gconf_schema_install rhythmbox.schemas
 %scrollkeeper_update_post
 %update_desktop_database_post
-%if %{without xine}
 %banner %{name} -e << EOF
 Remember to install appropriate GStreamer plugins for files
 you want to play:
@@ -110,37 +115,29 @@
 - gstreamer-mad (for MP3s)
 - gstreamer-vorbis (for Ogg Vorbis)
 EOF
-%else
-%banner %{name} -e << EOF
-Remember to install appropriate xine-decode plugins for files
-you want to play:
-- xine-decode-flac (for FLAC)
-- xine-decode-ogg (for Ogg Vorbis)
-EOF
-%endif
-
-%preun
-%gconf_schema_uninstall rhythmbox.schemas
 
 %postun 
 /sbin/ldconfig
 %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}/*
-%{_datadir}/gnome-2.0/ui/*.xml
+%attr(755,root,root) %{_libdir}/bonobo/*.so
 %{_datadir}/idl/*
 %{_datadir}/%{name}
+%{_datadir}/dbus-1/services/*.service
 %{_desktopdir}/*
 %{_libdir}/bonobo/servers/*
-%attr(755,root,root) %{_libdir}/bonobo/*.so
 %{_omf_dest_dir}/%{name}
 %{_pixmapsdir}/*
 %{_pkgconfigdir}/*
-%{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/gconf/schemas/rhythmbox.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -148,201 +145,38 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.49  2005/04/12 19:23:21  freetz
-- reversed ldconfig changes
-
-Revision 1.48  2005/04/08 11:36:28  paladine
-- new style macros
-- STBR
-
-Revision 1.47  2005/04/06 12:40:16  paladine
-- use new faster rpm's GConf automation
-- run scrollkeeper-update in quiet mode
-- R(post,postun): desktop-file-utils
-- don't package deprecated gnome-mime-data stuff
-- rel. 4
-
-Revision 1.46  2005/03/22 21:37:54  paladine
-- use %%banner
-- require some new stuff
-- gpm-friendly Source0 URL
-- proper license
-- rel. 3
-
-Revision 1.45  2005/03/20 22:00:07  aflinta
-- rebuild with howl 0.9.10, release 2
-
-Revision 1.44  2004/12/08 15:26:18  krzak
-- if build with xine then Requires: xine-plugin-audio
-
-Revision 1.43  2004/10/28 10:49:17  paladine
-- "MP3" unification
-
-Revision 1.42  2004/10/05 22:09:44  grzegol
-- updated to 0.8.8
-
-Revision 1.41  2004/09/29 22:14:55  freetz
-- 0.8.7, removed buildfix patch (outdated)
-
-Revision 1.40  2004/09/18 21:58:37  grzegol
-- updated to 0.8.6
-- removed locale-names patch and remove no locale in %%install
-- added buildfix patch
-- run /usr/bin/update-desktop-database in %%post and %%postun
-
-Revision 1.39  2004/09/17 05:40:17  freetz
-- desktop patch added, rel.2
-
-Revision 1.38  2004/06/26 16:27:54  aflinta
-- up to version 0.8.5
-
-Revision 1.37  2004/05/18 21:33:05  grzegol
-- updated to 0.8.4
-
-Revision 1.36  2004/05/04 11:07:18  grzegol
-- updated to 0.8.3
-
-Revision 1.35  2004/05/01 09:15:11  freetz
-- 0.8.2
-- more post install msgs / cosmetics
-- require gstreamer >= 0.8.1
-
-Revision 1.34  2004/04/20 20:35:45  aflinta
-- up to version 0.8.1
-
-Revision 1.33  2004/04/20 16:54:21  qboosh
-- added dup patch (fixes build on big-endians)
-- added URL, .so perms, release 3
-
-Revision 1.32  2004/04/19 21:57:10  krzak
-- audio_mpeg.patch that fix audio/mpeg files support
-- rel 2
-
-Revision 1.31  2004/04/19 17:06:36  krzak
-- --enable-ipod
-
-Revision 1.30  2004/04/16 19:05:52  wiget
-- updated to 0.8.0
-
-Revision 1.29  2004/04/08 12:14:57  grzegol
-- merged 0.7.2 from DEVEL
-
-Revision 1.28.2.7  2004/04/03 23:19:28  freetz
-- fixed typo
-
-Revision 1.28.2.6  2004/04/03 19:00:00  aflinta
-- up to verion 0.7.2
-
-Revision 1.28.2.5  2004/03/17 12:22:23  grzegol
-- added epoch to gtk+2 requires
-
-Revision 1.28.2.4  2004/03/17 06:41:31  aflinta
-- up to version 0.7.1
-
-Revision 1.28.2.3  2004/03/16 14:27:44  grzegol
-- rel. 3 to rebuild with gstreamer-0.8.0
-
-Revision 1.28.2.2  2004/03/10 17:08:04  grzegol
-- rel. 2 to rebuild with gstreamer-0.7.6
-- added gstreamer08 patch (gstreamer 0.7.6 has major version 0.8)
-- added locale-names patch changes locale no -> nb)
-- added vorbis patch (fixes configure.ac)
-- regenerate lt/al/ac/am
-
-Revision 1.28.2.1  2004/02/07 12:02:10  grzegol
-- updated to 0.7.0 (requires gst >= 0.7.4)
-- flac, libid3tag, libmad, libogg and libvorbis are required only when building
-  with xine support
-
-Revision 1.28  2004/02/06 19:11:00  grzegol
-- rel. 2 to rebuild with gstreamer-0.7.4 (for NEST)
-
-Revision 1.27  2004/01/22 10:05:05  grzegol
-- updated to 0.6.5
-
-Revision 1.26  2004/01/09 16:16:45  wiget
-- 0.6.4
-
-Revision 1.25  2003/12/23 09:56:53  trojan
-- updated to 0.6.3
-
-Revision 1.24  2003/12/18 07:36:57  trojan
-- updated to 0.6.2
-
-Revision 1.23  2003/11/25 22:00:32  wiget
-- release 2
-
-Revision 1.22  2003/11/24 22:09:18  grzegol
-- added Requires(post,postun): /sbin/ldconfig
-- added Requires(post,postun): /usr/bin/scrollkeeper-update
-- s/BR: mad-devel/BR: libmad-devel/
-- better bcond description
-
-Revision 1.21  2003/11/23 11:45:48  wrobell
-- ver. 0.6.1
-
-Revision 1.20  2003/11/13 18:08:50  wrobell
-- rel. 2
-
-Revision 1.19  2003/11/13 17:53:53  wrobell
-- xosd is not used:
-  http://mail.gnome.org/archives/rhythmbox-devel/2003-November/msg00112.html
-
-Revision 1.18  2003/11/12 20:27:56  freetz
-- BR libid3tag-devel
-
-Revision 1.17  2003/11/12 10:04:22  wrobell
-- ver. 0.6.0
-
-Revision 1.16  2003/10/28 06:52:31  trojan
-- updated to 0.5.4
-
-Revision 1.15  2003/10/22 19:30:53  krzak
-- typos in %%post
-
-Revision 1.14  2003/10/21 23:16:11  freetz
-- postinstall message added (about required gst-plugins)
-
-Revision 1.13  2003/10/21 23:00:44  freetz
-- back to previous functionality: don't force to use audio decoders
-  "out of the box"
-
-Revision 1.12  2003/10/21 21:18:42  freetz
-- more R - now works "out of the box"
-
-Revision 1.11  2003/10/21 16:26:17  freetz
-- gstreamer-gnomevfs moved to R (isn't required at compile time)
-- style unification, sorted files list
+Revision 1.50  2005/10/17 09:27:07  freetz
+- merged from DEVEL
 
-Revision 1.10  2003/10/21 13:39:42  wrobell
-- rel. 3
+Revision 1.46.2.10  2005/10/17 09:13:19  freetz
+- 0.9.1, more BRs, more features enabled and it works even more stable
+  will be moved to HEAD soon
 
-Revision 1.9  2003/10/21 13:23:33  wrobell
-- there are several audio sinks provided by gstreamer, audio applications
-  needs one of them
+Revision 1.46.2.9  2005/08/28 01:37:08  aredridel
+- added gtk 2.8 crash patch
 
-Revision 1.8  2003/10/14 18:30:21  freetz
-- xine bcond added
-- removed unneeded .{a,la}
-- more BR
+Revision 1.46.2.8  2005/08/18 11:45:50  aflinta
+- rebuild with cair, rel. 2
 
-Revision 1.7  2003/09/06 10:50:52  aflinta
-- version 0.5.3
+Revision 1.46.2.7  2005/08/10 15:10:06  freetz
+- 0.9.0 official release
 
-Revision 1.6  2003/08/27 06:25:55  aflinta
-- version 0.5.2, gstreamer version should be on head, if You encounter problems with it, please run gst-register from user (not root)
+Revision 1.46.2.6  2005/08/03 14:58:27  freetz
+- remove obsoleted dirs, cleanup, more BRs, smallnote about ipod support
 
-Revision 1.5  2003/08/19 06:35:21  aflinta
-- version 0.5.1, added TODO
+Revision 1.46.2.5  2005/08/03 13:49:55  freetz
+- 20050803 snap, removed obsoleted stuff (like unmaintained xine backend)
+  ar,mn locale removed (broken)
 
-Revision 1.4  2003/08/18 08:09:31  gotar
-- mass commit: cosmetics (removed trailing white spaces)
+Revision 1.46.2.4  2005/05/22 23:59:06  wrobell
+- snap 20050523
 
-Revision 1.3  2003/08/17 22:01:58  wiget
-- use xine backend
+Revision 1.46.2.3  2005/05/20 19:16:26  wrobell
+- fixed rel (it should be 05 not 09!)
+- fixed compilation of ipod hal support
 
-Revision 1.2  2003/08/17 21:23:23  aredridel
-- patch to fix mmkeys problem (gnome bug #120096)
+Revision 1.46.2.2  2005/05/20 18:19:02  wrobell
+- snap 20050920 from merge tree
 
-Revision 1.1  2003/08/17 07:23:51  aflinta
-- rhythmbox is back again :), version 0.5.0
+Revision 1.46.2.1  2005/03/25 01:27:34  wrobell
+- ver 0.9.0, snap 2005-03-25
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rhythmbox.spec?r1=1.49&r2=1.50&f=u




More information about the pld-cvs-commit mailing list