SPECS (DEVEL): amarok.spec - started update to 1.4beta2 - merged c...

[paszczus]

Author: paszczus                     Date: Thu Mar  9 19:56:16 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- started update to 1.4beta2
- merged changes from HEAD (separated xmms module)
- BR gstreamer-plugins-devel 0.10.0 instead of 0.8.6

---- Files affected:
SPECS:
   amarok.spec (1.106.2.6 -> 1.106.2.7) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.106.2.6 SPECS/amarok.spec:1.106.2.7
--- SPECS/amarok.spec:1.106.2.6	Tue Feb 14 17:46:55 2006
+++ SPECS/amarok.spec	Thu Mar  9 20:56:11 2006
@@ -25,7 +25,7 @@
 %undefine	with_helix
 %endif
 
-%define		_beta	beta1
+%define		_beta	beta2
 
 Summary:	A KDE audio player
 Summary(pl):	Odtwarzacz audio dla KDE
@@ -35,7 +35,7 @@
 License:	GPL
 Group:		X11/Applications/Multimedia
 Source0:	http://dl.sourceforge.net/amarok/%{name}-%{version}-%{_beta}.tar.bz2
-# Source0-md5:	78dfa2c8c65cb7fe1cf26aaa6cc193e8
+# Source0-md5:	0c7e2a5e8ea2d73d8e73b986090cfc37
 Patch0:		kde-common-gcc4.patch
 Patch1:		%{name}-lyricsurl.patch
 Patch2:		%{name}-helixplayer-morearchs.patch
@@ -47,7 +47,7 @@
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel
 BuildRequires:	gettext-devel
-%{?with_gstreamer:BuildRequires:	gstreamer-plugins-devel >= 0.8.6}
+%{?with_gstreamer:BuildRequires:	gstreamer-plugins-devel >= 0.10.0}
 BuildRequires:	gtk+2-devel
 BuildRequires:	kdebase-devel
 %{?with_akode:BuildRequires:	kdemultimedia-akode}
@@ -163,6 +163,18 @@
 %description xine -l pl
 Wtyczka xine.
 
+%package xmms
+Summary:	Xmms wrapper
+Summary(pl):	Wrapper xmms
+Group:		X11/Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+
+%description xmms
+Xmms wrapper.
+
+%description xmms -l pl
+Wrapper xmms.
+
 %package zeroconf
 Summary:	Zeroconf data
 Summary(pl):	Dane dla zeroconf
@@ -199,7 +211,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{_beta}
-%patch0 -p1
+#%patch0 -p1
 %{?with_altlyrics:%patch1 -p1}
 %patch2 -p1
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
@@ -268,7 +280,6 @@
 %attr(755,root,root) %{_bindir}/amarokapp
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
 %attr(755,root,root) %{_bindir}/amarok_libvisual
-%{?with_xmms:%attr(755,root,root) %{_bindir}/amarok_xmmswrapper2}
 %attr(755,root,root) %{_libdir}/libamarok.so.*.*.*
 %{_libdir}/kde3/konqsidebar_universalamarok.la
 %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so
@@ -352,6 +363,12 @@
 #%{_datadir}/services/amarok_xineengine_plugin.desktop
 %endif
 
+%if %{with xmms}
+%files xmms
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/amarok_xmmswrapper2
+%endif
+
 %if 0
 %if %{with zeroconf}
 %files zeroconf
@@ -399,6 +416,8 @@
 %{_datadir}/apps/amarok/scripts/webcontrol/template.thtml
 %{_datadir}/apps/amarok/scripts/webcontrol/vol_speaker.png
 %{_datadir}/apps/amarok/scripts/webcontrol/WebPublisher.py
+%{_datadir}/apps/amarok/scripts/webcontrol/WebControl.spec
+
 %attr(755,root,root)  %{_datadir}/apps/amarok/scripts/webcontrol/WebControl.py
 
 %dir %{_datadir}/apps/amarok/scripts/common
@@ -431,11 +450,13 @@
 %{_datadir}/apps/amarok/scripts/lyrics_astraweb/COPYING
 %{_datadir}/apps/amarok/scripts/lyrics_astraweb/README
 %{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
+%{_datadir}/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
 
 %dir %{_datadir}/apps/amarok/scripts/lyrics_lyrc
 %{_datadir}/apps/amarok/scripts/lyrics_lyrc/COPYING
 %{_datadir}/apps/amarok/scripts/lyrics_lyrc/README
 %{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
+%{_datadir}/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
 
 %dir %{_datadir}/apps/amarok/scripts/ruby_debug
 %{_datadir}/apps/amarok/scripts/ruby_debug/debug.rb
@@ -454,6 +475,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106.2.7  2006/03/09 19:56:11  paszczus
+- started update to 1.4beta2
+- merged changes from HEAD (separated xmms module)
+- BR gstreamer-plugins-devel 0.10.0 instead of 0.8.6
+
 Revision 1.106.2.6  2006/02/14 16:46:55  glen
 - reverted kde bug -- it's not resolved (it was ignored instead)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.106.2.6&r2=1.106.2.7&f=u