SPECS (DEVEL): amarok.spec - clean up the mess

shadzik shadzik at pld-linux.org
Mon May 26 18:50:43 CEST 2008 

Author: shadzik                      Date: Mon May 26 16:50:43 2008 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- clean up the mess

---- Files affected:
SPECS:
   amarok.spec (1.123.2.12 -> 1.123.2.13) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.123.2.12 SPECS/amarok.spec:1.123.2.13
--- SPECS/amarok.spec:1.123.2.12	Mon May 26 18:36:07 2008
+++ SPECS/amarok.spec	Mon May 26 18:50:38 2008
@@ -35,14 +35,6 @@
 Group:		X11/Applications/Multimedia
 Source0:	ftp://ftp.kde.org/pub/kde/unstable/amarok/1.80/src/%{name}-1.80.tar.bz2
 # Source0-md5:	ed37b7f92454a5163d6e4060602a6805
-#Patch0:		%{name}-helixplayer-morearchs.patch
-#Patch1:		%{name}-libnjb.patch
-#Patch2:		%{name}-smp.patch
-#Patch3:		%{name}-sparc.patch
-#Patch4:		kde-ac260-lt.patch
-#Patch5:		kde-common-PLD.patch
-#Patch6:		%{name}-gcc4.patch
-#Patch7:		%{name}-titleorder.patch
 URL:		http://amarok.kde.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
@@ -54,7 +46,6 @@
 BuildRequires:	kde4-kdebase-devel
 BuildRequires:	kde4-kdemultimedia-devel
 BuildRequires:	kde4-kdesupport-taglib-devel
-%{?with_akode:BuildRequires:	kdemultimedia-akode}
 %{?with_mp3players:BuildRequires:	libgpod-devel >= 0.4.2}
 %{?with_mp3players:BuildRequires:	libifp-devel >= 1.0.0.2}
 BuildRequires:	libltdl-devel
@@ -70,7 +61,6 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	ruby-devel >= 1.8
-BuildRequires:	sed >= 4.0
 %{!?with_included_sqlite:BuildRequires:	sqlite3-devel >= 3.3}
 BuildRequires:	strigi-devel >= 0.5.5
 %{?with_xine:BuildRequires:	xine-lib-devel >= 1.1.1}
@@ -222,14 +212,6 @@
 
 %prep
 %setup -qn %{name}-1.80
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-#%patch6 -p1
-#%patch7 -p1
 
 %build
 install -d build
@@ -347,42 +329,7 @@
 %{_datadir}/kde4/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde4/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
-# TODO: move to subpackage
-#if %{with mp3players}
-#attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so
-#attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
-#attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so
-#attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so
-#{_datadir}/services/amarok_ifp-mediadevice.desktop
-#{_datadir}/services/amarok_ipod-mediadevice.desktop
-#{_datadir}/services/amarok_mtp-mediadevice.desktop
-#{_datadir}/services/amarok_njb-mediadevice.desktop
-#endif
-
-#if %{with akode}
-#files akode
-#defattr(644,root,root,755)
-#attr(755,root,root) %{_libdir}/kde3/libamarok_aKode-engine.so
-#{_datadir}/services/amarok_aKode-engine.desktop
-#%endif
-
-#%if %{with gstreamer}
-#%files gstreamer
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/kde3/libamarok_gst10engine_plugin.so
-#%{_datadir}/config.kcfg/gstconfig.kcfg
-#%{_datadir}/services/amarok_gst10engine_plugin.desktop
-#%endif
-
-#%if %{with helix}
-#%files helix
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so
-#%{_datadir}/config.kcfg/helixconfig.kcfg
-#%{_datadir}/services/amarok_helixengine_plugin.desktop
-#%endif
 
-%if %{with xine}
 %files xine
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/libamarok_xine-engine.so
@@ -390,68 +337,8 @@
 %{_datadir}/kde4/services/amarok_xine-engine.desktop
 %endif
 
-#%if 0
-#%if %{with zeroconf}
-#%files zeroconf
-#%defattr(644,root,root,755)
-#%{_datadir}/apps/zeroconf/_shoutcast._tcp
-#%endif
-#%endif
-
 %files scripts
 %defattr(644,root,root,755)
-#%dir %{_datadir}/apps/amarok/scripts/common
-#%{_datadir}/apps/amarok/scripts/common/Publisher.py
-#%{_datadir}/apps/amarok/scripts/common/Zeroconf.py
-
-#%dir %{_datadir}/apps/amarok/scripts/templates
-#%{_datadir}/apps/amarok/scripts/templates/amarok.rb
-#%{_datadir}/apps/amarok/scripts/templates/python_qt_template.py
-#%{_datadir}/apps/amarok/scripts/templates/ruby_qt_template.rb
-
-# amarok searches for executable programs for scripts
-# to figure out which files need to have execute permission, use this
-# find command:
-# $ find $RPM_BUILD_ROOT/usr/share/apps/amarok/scripts -perm +1
-
-#%dir %{_datadir}/apps/amarok/scripts/graphequalizer
-#%{_datadir}/apps/amarok/scripts/graphequalizer/README
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/graphequalizer/graphequalizer
-
-#%dir %{_datadir}/apps/amarok/scripts/playlist2html
-#%{_datadir}/apps/amarok/scripts/playlist2html/README
-#%{_datadir}/apps/amarok/scripts/playlist2html/Playlist.py
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/PlaylistServer.py
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/playlist2html/playlist2html.py
-
-#%dir %{_datadir}/apps/amarok/scripts/webcontrol
-#%{_datadir}/apps/amarok/scripts/webcontrol/README
-#%{_datadir}/apps/amarok/scripts/webcontrol/Globals.py
-#%{_datadir}/apps/amarok/scripts/webcontrol/Playlist.py
-#%{_datadir}/apps/amarok/scripts/webcontrol/RequestHandler.py
-#%{_datadir}/apps/amarok/scripts/webcontrol/amarok_cut.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/controlbackground.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/main.css
-#%{_datadir}/apps/amarok/scripts/webcontrol/main.js
-#%{_datadir}/apps/amarok/scripts/webcontrol/player_end.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/player_pause.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/player_play.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/player_start.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/player_stop.png
-#%{_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
-#%{_datadir}/apps/amarok/scripts/webcontrol/smallstar.png
-#%{_datadir}/apps/amarok/scripts/webcontrol/star.png
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/webcontrol/WebControl.py
-
-#%dir %{_datadir}/apps/amarok/scripts/lyrics_astraweb
-#%{_datadir}/apps/amarok/scripts/lyrics_astraweb/COPYING
-#%{_datadir}/apps/amarok/scripts/lyrics_astraweb/README
-#%attr(755,root,root) %{_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
@@ -472,20 +359,15 @@
 %dir %{_datadir}/apps/amarok/scripts/ruby_debug
 %{_datadir}/apps/amarok/scripts/ruby_debug/debug.rb
 
-#%if 0
-#%dir %{_datadir}/apps/amarok/scripts/amarok_live
-#%{_datadir}/apps/amarok/scripts/amarok_live/README
-#%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-#%{_datadir}/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-#%attr(755,root,root) %{_datadir}/apps/amarok/scripts/amarok_live/amarok_live.py
-#%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123.2.13  2008-05-26 16:50:38  shadzik
+- clean up the mess
+
 Revision 1.123.2.12  2008-05-26 16:36:07  shadzik
 - started fixes
 - BR: taglib-devel -> kde4-kdesupport-taglib-devel
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/amarok.spec?r1=1.123.2.12&r2=1.123.2.13&f=u

More information about the pld-cvs-commit mailing list