SPECS (AC-branch): kdemultimedia.spec - merge with HEAD
glen
glen at pld-linux.org
Thu Feb 14 22:55:31 CET 2008
Author: glen Date: Thu Feb 14 21:55:31 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merge with HEAD
---- Files affected:
SPECS:
kdemultimedia.spec (1.223.2.7 -> 1.223.2.8)
---- Diffs:
================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.223.2.7 SPECS/kdemultimedia.spec:1.223.2.8
--- SPECS/kdemultimedia.spec:1.223.2.7 Thu Feb 14 22:50:44 2008
+++ SPECS/kdemultimedia.spec Thu Feb 14 22:55:26 2008
@@ -5,11 +5,11 @@
# /usr/share/desktop-directories/kde-multimedia-music.directory
#
# Conditional build:
-%bcond_without alsa # build without ALSA support
-%bcond_without xine # build without xine support
-%bcond_with tunepimp
-%bcond_with gstreamer # build with gstreamer support
-%bcond_with hidden_visibility # pass '--fvisibility=hidden' & '--fvisibility-inlines-hidden' to g++
+%bcond_without alsa # build without ALSA support
+%bcond_without xine # build without xine support
+%bcond_with tunepimp # build with tunepimp support (needs old libtunepimp)
+%bcond_with gstreamer # build with gstreamer support (needs old gstreamer)
+%bcond_with hidden_visibility # gcc hidden visibility
#
%define _state stable
%define _minlibsevr 9:%{version}
@@ -28,6 +28,7 @@
Patch0: kde-common-PLD.patch
#Patch100: %{name}-branch.diff
Patch1: kde-ac260-lt.patch
+URL: http://www.kde.org/
BuildRequires: akode-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: arts-qt-devel
@@ -292,8 +293,8 @@
dźwiękowych i zarządzanie kolekcją oraz playlistami.
%if %{without gstreamer}
-Obsługa bibliotek gstreamer została wyłączona w tej wersji pakietu. Aby
-ją uaktywnić, należy przebudować pakiet źródłowy (.src.rpm) z parametrem
+Obsługa bibliotek gstreamer została wyłączona w tej wersji pakietu. Aby
+ją uaktywnić, należy przebudować pakiet źródłowy (.src.rpm) z parametrem
'--with gstreamer'.
%endif
@@ -560,6 +561,8 @@
fi
done
+find . -type f -name '*.mcopclass' | xargs %{__sed} -i -e 's:\.la::'
+
cp %{_datadir}/automake/config.sub admin
%{__make} -f admin/Makefile.common cvs
@@ -607,15 +610,27 @@
# PLD doesn't have 'Multimedia/Music' submenu
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu
+rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
+
%clean
rm -rf $RPM_BUILD_ROOT
%post akode -p /sbin/ldconfig
%postun akode -p /sbin/ldconfig
+%post artsplugin-xine -p /sbin/ldconfig
+%postun artsplugin-xine -p /sbin/ldconfig
+
%post arts -p /sbin/ldconfig
%postun arts -p /sbin/ldconfig
+%post audiocd -p /sbin/ldconfig
+%postun audiocd -p /sbin/ldconfig
+
+%post kmid -p /sbin/ldconfig
+%postun kmid -p /sbin/ldconfig
+
%post libkcddb -p /sbin/ldconfig
%postun libkcddb -p /sbin/ldconfig
@@ -631,64 +646,71 @@
%files devel
%defattr(644,root,root,755)
%{_includedir}/*.h
-#%{_includedir}/akode
%{_includedir}/arts/*.h
%{_includedir}/arts/*.idl
%{_includedir}/libkcddb
%{_includedir}/noatun
-#%{_libdir}/libakode.so
-%{_libdir}/libartsbuilder.so
-%{_libdir}/libartsgui.so
-%{_libdir}/libartsgui_idl.so
-%{_libdir}/libartsgui_kde.so
-%{_libdir}/libartsmidi_idl.so
-%{_libdir}/libartsmidi.so
-%{_libdir}/libartsmodules*.so
-%{_libdir}/libkcddb.so
-%{_libdir}/libnoatun.so
-%{_libdir}/libnoatuncontrols.so
-%{_libdir}/libnoatuntags.so
+%{_libdir}/libartsbuilder.la
+%attr(755,root,root) %{_libdir}/libartsbuilder.so
+%{_libdir}/libartscontrolapplet.la
+%attr(755,root,root) %{_libdir}/libartscontrolapplet.so
+%{_libdir}/libartscontrolsupport.la
+%attr(755,root,root) %{_libdir}/libartscontrolsupport.so
+%{_libdir}/libartseffects.la
+%{_libdir}/libartsgui.la
+%attr(755,root,root) %{_libdir}/libartsgui.so
+%{_libdir}/libartsgui_idl.la
+%attr(755,root,root) %{_libdir}/libartsgui_idl.so
+%{_libdir}/libartsgui_kde.la
+%attr(755,root,root) %{_libdir}/libartsgui_kde.so
+%{_libdir}/libartsmidi.la
+%attr(755,root,root) %{_libdir}/libartsmidi.so
+%{_libdir}/libartsmidi_idl.la
+%attr(755,root,root) %{_libdir}/libartsmidi_idl.so
+%{_libdir}/libartsmodules.la
+%attr(755,root,root) %{_libdir}/libartsmodules.so
+%{_libdir}/libartsmodulescommon.la
+%attr(755,root,root) %{_libdir}/libartsmodulescommon.so
+%{_libdir}/libartsmoduleseffects.la
+%attr(755,root,root) %{_libdir}/libartsmoduleseffects.so
+%{_libdir}/libartsmodulesmixers.la
+%attr(755,root,root) %{_libdir}/libartsmodulesmixers.so
+%{_libdir}/libartsmodulessynth.la
+%attr(755,root,root) %{_libdir}/libartsmodulessynth.so
+%{_libdir}/libkcddb.la
+%attr(755,root,root) %{_libdir}/libkcddb.so
+%{_libdir}/libnoatun.la
+%attr(755,root,root) %{_libdir}/libnoatun.so
+%{_libdir}/libnoatunarts.la
+%{_libdir}/libnoatuncontrols.la
+%attr(755,root,root) %{_libdir}/libnoatuncontrols.so
+%{_libdir}/libnoatuntags.la
+%attr(755,root,root) %{_libdir}/libnoatuntags.so
+%{_libdir}/libwinskinvis.la
%files akode
%defattr(644,root,root,755)
-%{_libdir}/libarts_akode.la
-%attr(755,root,root) %{_libdir}/libarts_akode.so
%attr(755,root,root) %{_libdir}/libarts_akode.so.*.*.*
%{_libdir}/mcop/akode*.mcop*
%files arts
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/midisend
-%{_libdir}/libartsbuilder.la
+%attr(755,root,root) %{_libdir}/libarts_audiofile.so.*.*.*
%attr(755,root,root) %{_libdir}/libartsbuilder.so.*.*.*
-%{_libdir}/libartscontrolapplet.la
%attr(755,root,root) %{_libdir}/libartscontrolapplet.so.*.*.*
-%{_libdir}/libartscontrolsupport.la
%attr(755,root,root) %{_libdir}/libartscontrolsupport.so.*.*.*
-%{_libdir}/libartseffects.la
%attr(755,root,root) %{_libdir}/libartseffects.so
-%{_libdir}/libartsgui.la
%attr(755,root,root) %{_libdir}/libartsgui.so.*.*.*
-%{_libdir}/libartsgui_idl.la
%attr(755,root,root) %{_libdir}/libartsgui_idl.so.*.*.*
-%{_libdir}/libartsgui_kde.la
%attr(755,root,root) %{_libdir}/libartsgui_kde.so.*.*.*
-%{_libdir}/libartsmidi.la
%attr(755,root,root) %{_libdir}/libartsmidi.so.*.*.*
-%{_libdir}/libartsmidi_idl.la
%attr(755,root,root) %{_libdir}/libartsmidi_idl.so.*.*.*
-%{_libdir}/libartsmodules.la
%attr(755,root,root) %{_libdir}/libartsmodules.so.*.*.*
-%{_libdir}/libartsmodulescommon.la
%attr(755,root,root) %{_libdir}/libartsmodulescommon.so.*.*.*
-%{_libdir}/libartsmoduleseffects.la
%attr(755,root,root) %{_libdir}/libartsmoduleseffects.so.*.*.*
-%{_libdir}/libartsmodulesmixers.la
%attr(755,root,root) %{_libdir}/libartsmodulesmixers.so.*.*.*
-%{_libdir}/libartsmodulessynth.la
%attr(755,root,root) %{_libdir}/libartsmodulessynth.so.*.*.*
-%{_libdir}/libarts_audiofile.la
-%attr(755,root,root) %{_libdir}/libarts_audiofile.so.*.*.*
%{_libdir}/mcop/Arts
%{_libdir}/mcop/artseffects.mcopclass
%{_libdir}/mcop/artseffects.mcoptype
@@ -732,10 +754,7 @@
%if %{with xine}
%files artsplugin-xine
%defattr(644,root,root,755)
-%{_libdir}/kde3/videothumbnail.la
%attr(755,root,root) %{_libdir}/kde3/videothumbnail.so
-%{_libdir}/*_xine.la
-%attr(755,root,root) %{_libdir}/*_xine.so
%attr(755,root,root) %{_libdir}/libarts_xine.so.*.*.*
%{_libdir}/mcop/xine*PlayObject.mcopclass
%{_datadir}/apps/videothumbnail
@@ -744,14 +763,10 @@
%files audiocd -f kioslave.lang
%defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_audiocd.la
%attr(755,root,root) %{_libdir}/kde3/kcm_audiocd.so
-%{_libdir}/kde3/kio_audiocd.la
%attr(755,root,root) %{_libdir}/kde3/kio_audiocd.so
-%{_libdir}/kde3/libaudiocd_encoder*.la
%attr(755,root,root) %{_libdir}/kde3/libaudiocd_encoder*.so
-%{_libdir}/libaudiocdplugins.la
-%attr(755,root,root) %{_libdir}/libaudiocdplugins.so*
+%attr(755,root,root) %{_libdir}/libaudiocdplugins.so.*.*.*
%{_datadir}/apps/kconf_update/upgrade-metadata.sh
%{_datadir}/apps/konqueror/servicemenus/audiocd_*.desktop
%{_datadir}/config.kcfg/audiocd_*_encoder.kcfg
@@ -760,7 +775,6 @@
%files cddb
%defattr(644,root,root,755)
-%{_libdir}/kde3/kcm_cddb.la
%attr(755,root,root) %{_libdir}/kde3/kcm_cddb.so
%{_datadir}/config.kcfg/libkcddb.kcfg
%{_desktopdir}/kde/libkcddb.desktop
@@ -776,7 +790,6 @@
%files kaboodle -f kaboodle.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kaboodle
-%{_libdir}/kde3/libkaboodlepart.la
%attr(755,root,root) %{_libdir}/kde3/libkaboodlepart.so
%{_datadir}/apps/kaboodle
%{_datadir}/services/kaboodle_component.desktop
@@ -800,17 +813,13 @@
%files kfile
%defattr(644,root,root,755)
-%{_libdir}/kde3/kfile_*.la
%attr(755,root,root) %{_libdir}/kde3/kfile_*.so
%{_datadir}/services/kfile_*.desktop
%files kmid -f kmid.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kmid
-%{_libdir}/kde3/libkmidpart.la
%attr(755,root,root) %{_libdir}/kde3/libkmidpart.so
-%{_libdir}/libkmidlib.la
-%{_libdir}/libkmidlib.so
%attr(755,root,root) %{_libdir}/libkmidlib.so.*.*.*
%{_datadir}/apps/kmid
%{_datadir}/mimelnk/audio/x-karaoke.desktop
@@ -822,15 +831,10 @@
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/kmix
%attr(755,root,root) %{_bindir}/kmixctrl
-%{_libdir}/libkdeinit_kmix.la
%attr(755,root,root) %{_libdir}/libkdeinit_kmix.so
-%{_libdir}/libkdeinit_kmixctrl.la
%attr(755,root,root) %{_libdir}/libkdeinit_kmixctrl.so
-%{_libdir}/kde3/kmix.la
%attr(755,root,root) %{_libdir}/kde3/kmix.so
-%{_libdir}/kde3/kmixctrl.la
%attr(755,root,root) %{_libdir}/kde3/kmixctrl.so
-%{_libdir}/kde3/kmix_panelapplet.la
%attr(755,root,root) %{_libdir}/kde3/kmix_panelapplet.so
%{_datadir}/apps/kicker/applets/kmixapplet.desktop
%{_datadir}/apps/kmix
@@ -853,19 +857,12 @@
%files krec -f krec.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/krec
-%{_libdir}/libkdeinit_krec.la
%attr(755,root,root) %{_libdir}/libkdeinit_krec.so
-%{_libdir}/kde3/kcm_krec.la
%attr(755,root,root) %{_libdir}/kde3/kcm_krec.so
-%{_libdir}/kde3/kcm_krec_files.la
%attr(755,root,root) %{_libdir}/kde3/kcm_krec_files.so
-%{_libdir}/kde3/krec.la
%attr(755,root,root) %{_libdir}/kde3/krec.so
-%{_libdir}/kde3/libkrecexport_mp3.la
%attr(755,root,root) %{_libdir}/kde3/libkrecexport_mp3.so
-%{_libdir}/kde3/libkrecexport_ogg.la
%attr(755,root,root) %{_libdir}/kde3/libkrecexport_ogg.so
-%{_libdir}/kde3/libkrecexport_wave.la
%attr(755,root,root) %{_libdir}/kde3/libkrecexport_wave.so
%{_datadir}/apps/krec
%{_datadir}/services/kcm_krec.desktop
@@ -879,20 +876,16 @@
%files libkcddb
%defattr(644,root,root,755)
-%{_libdir}/libkcddb.la
%attr(755,root,root) %{_libdir}/libkcddb.so.*.*.*
%files mpeglib
%defattr(644,root,root,755)
-# mpeglib part
-%{_libdir}/libmpeg.la
-%attr(755,root,root) %{_libdir}/libmpeg-0.3.0.so
-# mpeglib_artsplug part
%attr(755,root,root) %{_bindir}/mpeglibartsplay
-%{_libdir}/libarts_mpeglib.la
-%attr(755,root,root) %{_libdir}/libarts_mpeglib-0.3.0.so.*.*.*
-%{_libdir}/libarts_splay.la
+%attr(755,root,root) %{_libdir}/libarts_mpeglib-*.*.*.so.*.*.*
%attr(755,root,root) %{_libdir}/libarts_splay.so.*.*.*
+%attr(755,root,root) %{_libdir}/libmpeg-*.*.*.so
+%attr(755,root,root) %{_libdir}/libyafcore.so
+%attr(755,root,root) %{_libdir}/libyafxplayer.so
%{_libdir}/mcop/CDDAPlayObject.mcopclass
%{_libdir}/mcop/MP3PlayObject.mcopclass
%{_libdir}/mcop/NULLPlayObject.mcopclass
@@ -902,13 +895,16 @@
%files mpeglib-devel
%defattr(644,root,root,755)
+%{_includedir}/mpeglib
+%{_includedir}/mpeglib_artsplug
+%{_libdir}/libarts_mpeglib.la
%attr(755,root,root) %{_libdir}/libarts_mpeglib.so
+%{_libdir}/libarts_splay.la
%attr(755,root,root) %{_libdir}/libarts_splay.so
+%{_libdir}/libmpeg.la
%attr(755,root,root) %{_libdir}/libmpeg.so
-%attr(755,root,root) %{_libdir}/libyafcore.so
-%attr(755,root,root) %{_libdir}/libyafxplayer.so
-%{_includedir}/mpeglib
-%{_includedir}/mpeglib_artsplug
+%{_libdir}/libyafcore.la
+%{_libdir}/libyafxplayer.la
%files mpeglib-examples
%defattr(644,root,root,755)
@@ -918,15 +914,11 @@
%attr(755,root,root) %{_bindir}/yaf-tplay
%attr(755,root,root) %{_bindir}/yaf-vorbis
%attr(755,root,root) %{_bindir}/yaf-yuv
-%{_libdir}/libyafcore.la
-%{_libdir}/libyafxplayer.la
%files noatun -f noatun.lang
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/noatun*
-%{_libdir}/libkdeinit_noatun.la
%attr(755,root,root) %{_libdir}/libkdeinit_noatun.so
-%{_libdir}/kde3/noatun*.la
%attr(755,root,root) %{_libdir}/kde3/noatun*.so
%{_libdir}/mcop/Noatun
%{_libdir}/mcop/ExtraStereo.mcopclass
@@ -947,15 +939,10 @@
%files noatun-libs
%defattr(644,root,root,755)
-%{_libdir}/libnoatun.la
%attr(755,root,root) %{_libdir}/libnoatun.so.*.*.*
-%{_libdir}/libnoatuncontrols.la
+%attr(755,root,root) %{_libdir}/libnoatunarts.so
%attr(755,root,root) %{_libdir}/libnoatuncontrols.so.*.*.*
-%{_libdir}/libnoatuntags.la
%attr(755,root,root) %{_libdir}/libnoatuntags.so.*.*.*
-%{_libdir}/libnoatunarts.la
-%attr(755,root,root) %{_libdir}/libnoatunarts.so
-%{_libdir}/libwinskinvis.la
%attr(755,root,root) %{_libdir}/libwinskinvis.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -964,6 +951,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.223.2.8 2008-02-14 21:55:26 glen
+- merge with HEAD
+
Revision 1.223.2.7 2008-02-14 21:50:44 glen
- conver to utf8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdemultimedia.spec?r1=1.223.2.7&r2=1.223.2.8&f=u
More information about the pld-cvs-commit
mailing list