Author: glen Date: Wed Dec 27 09:53:13 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - drop .la once more
---- Files affected: SPECS: amarok.spec (1.151 -> 1.152) ---- Diffs: ================================================================ Index: SPECS/amarok.spec diff -u SPECS/amarok.spec:1.151 SPECS/amarok.spec:1.152 --- SPECS/amarok.spec:1.151 Tue Dec 26 22:09:57 2006 +++ SPECS/amarok.spec Wed Dec 27 10:53:08 2006 @@ -29,7 +29,7 @@ Summary(pl): Odtwarzacz audio dla KDE Name: amarok Version: 1.4.4 -Release: 7 +Release: 6 License: GPL Group: X11/Applications/Multimedia #Source0: http://dl.sourceforge.net/amarok/%{name}-%{version}.tar.bz2 @@ -42,7 +42,6 @@ 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 @@ -56,9 +55,9 @@ BuildRequires: kdemultimedia-devel >= 9:3.1.93 %{?with_mp3players:BuildRequires: libgpod-devel >= 0.2.0} %{?with_mp3players:BuildRequires: libifp-devel} -BuildRequires: libltdl-devel %{?with_mp3players:BuildRequires: libmtp-devel} %{?with_mp3players:BuildRequires: libnjb-devel} +BuildRequires: libltdl-devel %{?with_pgsql:BuildRequires: libpqxx-devel} BuildRequires: libtunepimp-devel >= 0.5.1-6 BuildRequires: libvisual-devel >= 0.4.0 @@ -215,7 +214,6 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;AudioVideo;Player;/' \ amarok/src/amarok.desktop \ @@ -271,7 +269,7 @@ # remove bogus dir rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/xx -rm $RPM_BUILD_ROOT%{_libdir}/ruby_lib/libhttp11.la +rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la %find_lang amarok --all-name --with-kde @@ -298,21 +296,13 @@ %attr(755,root,root) %{_bindir}/amarok_daapserver.rb %attr(755,root,root) %{_libdir}/libamarok.so %attr(755,root,root) %{_libdir}/libamarok.so.*.*.* -%{_libdir}/libamarok.la %attr(755,root,root) %{_libdir}/kde3/konqsidebar_universalamarok.so -%{_libdir}/kde3/konqsidebar_universalamarok.la %attr(755,root,root) %{_libdir}/kde3/libamarok_generic-mediadevice.so -%{_libdir}/kde3/libamarok_generic-mediadevice.la %attr(755,root,root) %{_libdir}/kde3/libamarok_void-engine_plugin.so -%{_libdir}/kde3/libamarok_void-engine_plugin.la %attr(755,root,root) %{_libdir}/kde3/libamarok_daap-mediadevice.so -%{_libdir}/kde3/libamarok_daap-mediadevice.la %attr(755,root,root) %{_libdir}/kde3/libamarok_massstorage-device.so -%{_libdir}/kde3/libamarok_massstorage-device.la %attr(755,root,root) %{_libdir}/kde3/libamarok_nfs-device.so -%{_libdir}/kde3/libamarok_nfs-device.la %attr(755,root,root) %{_libdir}/kde3/libamarok_smb-device.so -%{_libdir}/kde3/libamarok_smb-device.la %{_libdir}/ruby_lib/http11.rb %attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so %attr(755,root,root) %{_libdir}/ruby_lib/libhttp11.so.0.0.0 @@ -349,13 +339,9 @@ # TODO: move to subpackage %if %{with mp3players} %attr(755,root,root) %{_libdir}/kde3/libamarok_ifp-mediadevice.so -%{_libdir}/kde3/libamarok_ifp-mediadevice.la %attr(755,root,root) %{_libdir}/kde3/libamarok_ipod-mediadevice.so -%{_libdir}/kde3/libamarok_ipod-mediadevice.la %attr(755,root,root) %{_libdir}/kde3/libamarok_mtp-mediadevice.so -%{_libdir}/kde3/libamarok_mtp-mediadevice.la %attr(755,root,root) %{_libdir}/kde3/libamarok_njb-mediadevice.so -%{_libdir}/kde3/libamarok_njb-mediadevice.la %{_datadir}/services/amarok_ifp-mediadevice.desktop %{_datadir}/services/amarok_ipod-mediadevice.desktop %{_datadir}/services/amarok_mtp-mediadevice.desktop @@ -381,7 +367,6 @@ %files helix %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/kde3/libamarok_helixengine_plugin.so -%{_libdir}/kde3/libamarok_helixengine_plugin.la %{_datadir}/config.kcfg/helixconfig.kcfg %{_datadir}/services/amarok_helixengine_plugin.desktop %endif @@ -390,7 +375,6 @@ %files xine %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/kde3/libamarok_xine-engine.so -%{_libdir}/kde3/libamarok_xine-engine.la %{_datadir}/config.kcfg/xinecfg.kcfg %{_datadir}/services/amarok_xine-engine.desktop %endif @@ -497,8 +481,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.151 2006/12/26 21:09:57 glen -- the .la files are needed for amarok to find engines; rel 7 +Revision 1.152 2006/12/27 09:53:08 glen +- drop .la once more Revision 1.150 2006/12/22 01:21:15 shadzik - rel 6 for rebuild ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/amarok.spec?r1=1.151&r2=1.152&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
