SPECS (DEVEL): amarok.spec - BR: pkgconfig - killed hack for kde b...

[charles]

Author: charles                      Date: Tue Feb 14 15:29:39 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- BR: pkgconfig
- killed hack for kde bug #110909 (Status: RESOLVED)
- updated %files for mp3players bcond, sorted
- post,postun /sbin/ldconfig

---- Files affected:
SPECS:
   amarok.spec (1.106.2.4 -> 1.106.2.5) 

---- Diffs:

================================================================
Index: SPECS/amarok.spec
diff -u SPECS/amarok.spec:1.106.2.4 SPECS/amarok.spec:1.106.2.5
--- SPECS/amarok.spec:1.106.2.4	Mon Feb 13 20:42:45 2006
+++ SPECS/amarok.spec	Tue Feb 14 16:29:30 2006
@@ -61,6 +61,7 @@
 BuildRequires:	mpeg4ip-devel
 %{?with_mysql:BuildRequires:		mysql-devel}
 BuildRequires:	pcre-devel
+BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	sed >= 4.0
@@ -204,14 +205,8 @@
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \
 	amarok/src/amarok.desktop \
 
-# see kde bug #110909
-sed -i -e 's/amarok_live//' amarok/src/scripts/Makefile.am
-
 %build
 cp -f /usr/share/automake/config.sub admin
-
-#export UNSERMAKE=/usr/share/unsermake/unsermake
-
 %{__make} -f admin/Makefile.common cvs
 
 # hack: passing something other than "no" or "yes" to --with-helix allows
@@ -259,25 +254,25 @@
 	echo "Remember to install libvisual-plugins-* packages if you"
 	echo "want to have a visualizations in amaroK."
 fi
+/sbin/ldconfig
+
+%postun	-p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
 %attr(755,root,root) %{_bindir}/amarok
-%{?with_xmms:%attr(755,root,root) %{_bindir}/amarok_xmmswrapper2}
 %attr(755,root,root) %{_bindir}/amarokapp
-%attr(755,root,root) %{_bindir}/amarok_libvisual
 %attr(755,root,root) %{_bindir}/amarokcollectionscanner
-#%attr(755,root,root) %{_bindir}/release_amarok
+%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
-%{_libdir}/kde3/libamarok_void-engine_plugin.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
-%{_libdir}/kde3/libamarok_ipod-mediadevice.la
-%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
 %{_libdir}/kde3/libamarok_vfat-mediadevice.la
 %attr(755,root,root) %{_libdir}/kde3/libamarok_vfat-mediadevice.so
+%{_libdir}/kde3/libamarok_void-engine_plugin.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so
 %{_libdir}/libamarok.la
 %dir %{_datadir}/apps/amarok
 %dir %{_datadir}/apps/amarok/scripts
@@ -293,12 +288,17 @@
 %{_datadir}/apps/profiles/amarok.profile.xml
 %{_datadir}/config/amarokrc
 %{_datadir}/config.kcfg/amarok.kcfg
-%{_datadir}/services/amarok_void-engine_plugin.desktop
-%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/servicetypes/amarok_plugin.desktop
 %{_desktopdir}/kde/amarok.desktop
 %{_iconsdir}/*/*/apps/amarok.*
+# TODO: move to subpackage
+%if %{with mp3players}
+%{_libdir}/kde3/libamarok_ipod-mediadevice.la
+%attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
+%endif
 
 %if %{with arts}
 %files arts
@@ -451,6 +451,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106.2.5  2006/02/14 15:29:30  charles
+- BR: pkgconfig
+- killed hack for kde bug #110909 (Status: RESOLVED)
+- updated %files for mp3players bcond, sorted
+- post,postun /sbin/ldconfig
+
 Revision 1.106.2.4  2006/02/13 19:42:45  paszczus
 - added few more scripts
 
================================================================

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