SPECS: kdemultimedia.spec - merged KDE 3.5.9 from AC-branch
glen
glen at pld-linux.org
Sat Feb 16 00:42:34 CET 2008
Author: glen Date: Fri Feb 15 23:42:34 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged KDE 3.5.9 from AC-branch
---- Files affected:
SPECS:
kdemultimedia.spec (1.240 -> 1.241)
---- Diffs:
================================================================
Index: SPECS/kdemultimedia.spec
diff -u SPECS/kdemultimedia.spec:1.240 SPECS/kdemultimedia.spec:1.241
--- SPECS/kdemultimedia.spec:1.240 Thu Feb 14 22:54:44 2008
+++ SPECS/kdemultimedia.spec Sat Feb 16 00:42:29 2008
@@ -18,16 +18,17 @@
Summary: K Desktop Environment - multimedia applications
Summary(pl.UTF-8): K Desktop Environment - aplikacje multimedialne
Name: kdemultimedia
-Version: 3.5.8
+Version: 3.5.9
Release: 2
Epoch: 9
License: GPL
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f3c95231ea265b09f3010adb954ae30
-Patch0: kde-common-PLD.patch
+# Source0-md5: fdfafe38d2c7e3019dafc80c177add15
#Patch100: %{name}-branch.diff
+Patch0: kde-common-PLD.patch
Patch1: kde-ac260-lt.patch
+Patch2: %{name}-bug-157891.patch
URL: http://www.kde.org/
BuildRequires: akode-devel
%{?with_alsa:BuildRequires: alsa-lib-devel}
@@ -514,6 +515,7 @@
#%patch100 -p0
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Audio;Player;/' \
juk/juk.desktop \
@@ -587,13 +589,30 @@
%{__make}
%install
-rm -rf $RPM_BUILD_ROOT
-rm -f *.lang
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+ %{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT \
+ kde_htmldir=%{_kdedocdir}
+
+ touch makeinstall.stamp
+fi
+
+if [ ! -f installed.stamp ]; then
+ # PLD doesn't have 'Multimedia/Music' submenu
+ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu
+
+ # locolor icons are deprecated (in PLD?)
+ rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- kde_htmldir=%{_kdedocdir}
+ rm $RPM_BUILD_ROOT%{_libdir}/kde3/*.la
+ rm $RPM_BUILD_ROOT%{_libdir}/libkdeinit_*.la
+ touch installed.stamp
+fi
+
+rm -f *.lang
%find_lang artsbuilder --with-kde
%find_lang juk --with-kde
%find_lang kaudiocreator --with-kde
@@ -605,14 +624,6 @@
%find_lang kscd --with-kde
%find_lang noatun --with-kde
-# locolor icons are deprecated (in PLD?)
-rm -f $RPM_BUILD_ROOT%{_iconsdir}/locolor/*/apps/kaudiocreator.png
-# 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
@@ -687,30 +698,57 @@
%{_libdir}/libnoatuntags.la
%attr(755,root,root) %{_libdir}/libnoatuntags.so
%{_libdir}/libwinskinvis.la
+%attr(755,root,root) %{_libdir}/libarts_akode.so
+%{_libdir}/libarts_akode.la
+%attr(755,root,root) %{_libdir}/libarts_audiofile.so
+%{_libdir}/libarts_audiofile.la
+%if %{with xine}
+%attr(755,root,root) %{_libdir}/libarts_xine.so
+%{_libdir}/libarts_xine.la
+%endif
+%attr(755,root,root) %{_libdir}/libaudiocdplugins.so
+%{_libdir}/libaudiocdplugins.la
+%attr(755,root,root) %{_libdir}/libkmidlib.so
+%{_libdir}/libkmidlib.la
%files akode
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libarts_akode.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarts_akode.so.0
%{_libdir}/mcop/akode*.mcop*
%files arts
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/midisend
%attr(755,root,root) %{_libdir}/libarts_audiofile.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarts_audiofile.so.0
%attr(755,root,root) %{_libdir}/libartsbuilder.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsbuilder.so.0
%attr(755,root,root) %{_libdir}/libartscontrolapplet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartscontrolapplet.so.1
%attr(755,root,root) %{_libdir}/libartscontrolsupport.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartscontrolsupport.so.1
%attr(755,root,root) %{_libdir}/libartseffects.so
%attr(755,root,root) %{_libdir}/libartsgui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsgui.so.0
%attr(755,root,root) %{_libdir}/libartsgui_idl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsgui_idl.so.0
%attr(755,root,root) %{_libdir}/libartsgui_kde.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsgui_kde.so.0
%attr(755,root,root) %{_libdir}/libartsmidi.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmidi.so.0
%attr(755,root,root) %{_libdir}/libartsmidi_idl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmidi_idl.so.0
%attr(755,root,root) %{_libdir}/libartsmodules.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmodules.so.0
%attr(755,root,root) %{_libdir}/libartsmodulescommon.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmodulescommon.so.0
%attr(755,root,root) %{_libdir}/libartsmoduleseffects.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmoduleseffects.so.0
%attr(755,root,root) %{_libdir}/libartsmodulesmixers.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmodulesmixers.so.0
%attr(755,root,root) %{_libdir}/libartsmodulessynth.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libartsmodulessynth.so.0
%{_libdir}/mcop/Arts
%{_libdir}/mcop/artseffects.mcopclass
%{_libdir}/mcop/artseffects.mcoptype
@@ -730,7 +768,7 @@
%{_libdir}/mcop/artsmodulessynth.mcoptype
%{_libdir}/mcop/audiofilearts.mcopclass
%{_libdir}/mcop/audiofilearts.mcoptype
-%{_iconsdir}/[!l]*/*/actions/arts[!bc]*.*
+%{_iconsdir}/crystalsvg/*/actions/arts[!bc]*.*
%files artsbuilder -f artsbuilder.lang
%defattr(644,root,root,755)
@@ -740,8 +778,8 @@
%{_datadir}/apps/artsbuilder
%{_datadir}/mimelnk/application/x-artsbuilder.desktop
%{_desktopdir}/kde/artsbuilder.desktop
-%{_iconsdir}/[!l]*/*/actions/artsbuilderexecute.*
-%{_iconsdir}/[!l]*/*/apps/artsbuilder.*
+%{_iconsdir}/crystalsvg/*/actions/artsbuilderexecute.*
+%{_iconsdir}/hicolor/*/apps/artsbuilder.*
%files artscontrol
%defattr(644,root,root,755)
@@ -749,13 +787,14 @@
%{_datadir}/apps/artscontrol
%{_datadir}/apps/kicker/applets/artscontrolapplet.desktop
%{_desktopdir}/kde/artscontrol.desktop
-%{_iconsdir}/[!l]*/*/apps/artscontrol.*
+%{_iconsdir}/hicolor/*/apps/artscontrol.*
%if %{with xine}
%files artsplugin-xine
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/kde3/videothumbnail.so
%attr(755,root,root) %{_libdir}/libarts_xine.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarts_xine.so.0
%{_libdir}/mcop/xine*PlayObject.mcopclass
%{_datadir}/apps/videothumbnail
%{_datadir}/services/videothumbnail.desktop
@@ -767,7 +806,9 @@
%attr(755,root,root) %{_libdir}/kde3/kio_audiocd.so
%attr(755,root,root) %{_libdir}/kde3/libaudiocd_encoder*.so
%attr(755,root,root) %{_libdir}/libaudiocdplugins.so.*.*.*
-%{_datadir}/apps/kconf_update/upgrade-metadata.sh
+%attr(755,root,root) %ghost %{_libdir}/libaudiocdplugins.so.1
+%{_datadir}/apps/kconf_update/audiocd.upd
+%attr(755,root,root) %{_datadir}/apps/kconf_update/upgrade-metadata.sh
%{_datadir}/apps/konqueror/servicemenus/audiocd_*.desktop
%{_datadir}/config.kcfg/audiocd_*_encoder.kcfg
%{_datadir}/services/audiocd.protocol
@@ -776,6 +817,7 @@
%files cddb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/kde3/kcm_cddb.so
+%{_datadir}/apps/kconf_update/kcmcddb-emailsettings.upd
%{_datadir}/config.kcfg/libkcddb.kcfg
%{_desktopdir}/kde/libkcddb.desktop
@@ -807,7 +849,9 @@
%{_datadir}/apps/kaudiocreator
%{_datadir}/config.kcfg/kaudiocreator.kcfg
%{_datadir}/config.kcfg/kaudiocreator_encoders.kcfg
-%{_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
+%{_datadir}/apps/kconf_update/kaudiocreator-libkcddb.upd
+%{_datadir}/apps/kconf_update/kaudiocreator-meta.upd
+%attr(755,root,root) %{_datadir}/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
%{_desktopdir}/kde/kaudiocreator.desktop
%{_iconsdir}/*/*/*/kaudiocreator.png
@@ -821,6 +865,7 @@
%attr(755,root,root) %{_bindir}/kmid
%attr(755,root,root) %{_libdir}/kde3/libkmidpart.so
%attr(755,root,root) %{_libdir}/libkmidlib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkmidlib.so.0
%{_datadir}/apps/kmid
%{_datadir}/mimelnk/audio/x-karaoke.desktop
%{_datadir}/servicetypes/*midi*.desktop
@@ -877,12 +922,15 @@
%files libkcddb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libkcddb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkcddb.so.1
%files mpeglib
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mpeglibartsplay
%attr(755,root,root) %{_libdir}/libarts_mpeglib-*.*.*.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarts_mpeglib-*.*.*.so.0
%attr(755,root,root) %{_libdir}/libarts_splay.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libarts_splay.so.0
%attr(755,root,root) %{_libdir}/libmpeg-*.*.*.so
%attr(755,root,root) %{_libdir}/libyafcore.so
%attr(755,root,root) %{_libdir}/libyafxplayer.so
@@ -929,8 +977,8 @@
%{_libdir}/mcop/noatunarts.mcoptype
%{_libdir}/mcop/winskinvis.mcopclass
%{_libdir}/mcop/winskinvis.mcoptype
-%attr(755,root,root) %{_datadir}/apps/kconf_update/noatun20update
-%{_datadir}/apps/kconf_update/*.upd
+%{_datadir}/apps/kconf_update/noatun.upd
+%attr(755,root,root) %{_libdir}/kconf_update_bin/noatun20update
%{_datadir}/apps/noatun*
%dir %{_datadir}/mimelnk/interface
%{_datadir}/mimelnk/interface/x-winamp-skin.desktop
@@ -940,9 +988,12 @@
%files noatun-libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libnoatun.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnoatun.so.1
%attr(755,root,root) %{_libdir}/libnoatunarts.so
%attr(755,root,root) %{_libdir}/libnoatuncontrols.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnoatuncontrols.so.1
%attr(755,root,root) %{_libdir}/libnoatuntags.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnoatuntags.so.1
%attr(755,root,root) %{_libdir}/libwinskinvis.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -951,6 +1002,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.241 2008-02-15 23:42:29 glen
+- merged KDE 3.5.9 from AC-branch
+
Revision 1.240 2008-02-14 21:54:44 glen
- merged back not corrupted desc from adapter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdemultimedia.spec?r1=1.240&r2=1.241&f=u
More information about the pld-cvs-commit
mailing list