packages: kdemultimedia/kdemultimedia.spec - arts bcond on files, seems onl...

Fri Apr 23 16:23:14 CEST 2010

Author: glen                         Date: Fri Apr 23 14:23:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- arts bcond on files, seems only kcddb lib stays on -devel

---- Files affected:
packages/kdemultimedia:
   kdemultimedia.spec (1.250 -> 1.251) 

---- Diffs:

================================================================
Index: packages/kdemultimedia/kdemultimedia.spec
diff -u packages/kdemultimedia/kdemultimedia.spec:1.250 packages/kdemultimedia/kdemultimedia.spec:1.251

--- packages/kdemultimedia/kdemultimedia.spec:1.250	Fri Apr 23 11:14:51 2010
+++ packages/kdemultimedia/kdemultimedia.spec	Fri Apr 23 16:23:09 2010
@@ -1,8 +1,11 @@
 # $Revision$, $Date$
 # TODO:
 # - enable gstreamer after making it selectable runtime
-# - not sure about those unpackaged files:
-#   /usr/share/desktop-directories/kde-multimedia-music.directory
+# - fix build for newer autoconf (pld patch breaks it?):
+#   i686-pld-linux-g++: ./.libs/libkmidlib.so: No such file or directory
+#   make[3]: *** [kmid] Error 1
+#   make[3]: *** Waiting for unfinished jobs....
+#   make[3]: Leaving directory `/home/glen/BUILD/kdemultimedia-3.5.10/kmid'
 #
 # Conditional build:
 %bcond_without	alsa			# build without ALSA support
@@ -11,7 +14,7 @@
 %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}
 %define		_minbaseevr	9:%{version}
@@ -38,6 +41,7 @@
 %{?with_arts:BuildRequires:	arts-qt-devel}
 BuildRequires:	audiofile-devel
 BuildRequires:	autoconf
+BuildRequires:	autoconf < 2.64
 BuildRequires:	automake
 BuildRequires:	cdparanoia-III-devel >= alpha9.8-6
 BuildRequires:	flac-devel >= 1.1.2
@@ -73,6 +77,9 @@
 Obsoletes:	kdemultimedia-libworkman
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# build broken with spaces in CC
+%undefine	with_ccache
+
 %description
 KDE multimedia applications. Package includes:
 
@@ -588,6 +595,7 @@
 	--enable-libsuffix=64 \
 %endif
 	--with%{!?with_alsa:out}-arts-alsa \
+	--with%{!?with_arts:out}-arts \
 	--with-extra-includes=%{_includedir}/speex \
 	--with-qt-libraries=%{_libdir} \
 	--with-distribution="PLD Linux Distribution" \
@@ -611,6 +619,9 @@
 	# PLD doesn't have 'Multimedia/Music' submenu
 	rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu
 
+	# not packaged for ages
+	rm -f $RPM_BUILD_ROOT%{_datadir}/desktop-directories/kde-multimedia-music.directory
+
 	# locolor icons are deprecated (in PLD?)
 	rm -rf $RPM_BUILD_ROOT%{_iconsdir}/locolor
 
@@ -665,10 +676,22 @@
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/*.h
+%{_includedir}/libkcddb
+
+%if %{with arts}
 %{_includedir}/arts/*.h
 %{_includedir}/arts/*.idl
-%{_includedir}/libkcddb
 %{_includedir}/noatun
+%endif
+
+%attr(755,root,root) %{_libdir}/libkcddb.so
+%{_libdir}/libkcddb.la
+%attr(755,root,root) %{_libdir}/libaudiocdplugins.so
+%{_libdir}/libaudiocdplugins.la
+%attr(755,root,root) %{_libdir}/libkmidlib.so
+%{_libdir}/libkmidlib.la
+
+%if %{with arts}
 %{_libdir}/libartsbuilder.la
 %attr(755,root,root) %{_libdir}/libartsbuilder.so
 %{_libdir}/libartscontrolapplet.la
@@ -696,8 +719,6 @@
 %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
@@ -715,10 +736,6 @@
 #%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)
@@ -808,6 +825,7 @@
 %{_datadir}/apps/videothumbnail
 %{_datadir}/services/videothumbnail.desktop
 %endif
+%endif
 
 %files audiocd -f kioslave.lang
 %defattr(644,root,root,755)
@@ -838,6 +856,7 @@
 %{_desktopdir}/kde/juk.desktop
 %{_iconsdir}/*/*/*/juk*.png
 
+%if %{with arts}
 %files kaboodle -f kaboodle.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kaboodle
@@ -847,6 +866,7 @@
 %{_datadir}/services/kaboodleengine.desktop
 %{_desktopdir}/kde/kaboodle.desktop
 %{_iconsdir}/*/*/apps/kaboodle.*
+%endif
 
 %files kappfinder
 %defattr(644,root,root,755)
@@ -908,6 +928,7 @@
 %{_datadir}/mimelnk/text/xmcd.desktop
 %{_iconsdir}/*/*/*/kscd.png
 
+%if %{with arts}
 %files krec -f krec.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/krec
@@ -927,6 +948,7 @@
 %{_datadir}/servicetypes/krec_exportitem.desktop
 %{_desktopdir}/kde/krec.desktop
 %{_iconsdir}/*/*/*/krec*
+%endif
 
 %files libkcddb
 %defattr(644,root,root,755)
@@ -935,29 +957,35 @@
 
 %files mpeglib
 %defattr(644,root,root,755)
+%if %{with arts}
 %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
+%endif
 %attr(755,root,root) %{_libdir}/libmpeg-*.*.*.so
 %attr(755,root,root) %{_libdir}/libyafcore.so
 %attr(755,root,root) %{_libdir}/libyafxplayer.so
+%if %{with arts}
 %{_libdir}/mcop/CDDAPlayObject.mcopclass
 %{_libdir}/mcop/MP3PlayObject.mcopclass
 %{_libdir}/mcop/NULLPlayObject.mcopclass
 %{_libdir}/mcop/OGGPlayObject.mcopclass
 %{_libdir}/mcop/SplayPlayObject.mcopclass
 %{_libdir}/mcop/WAVPlayObject.mcopclass
+%endif
 
 %files mpeglib-devel
 %defattr(644,root,root,755)
 %{_includedir}/mpeglib
+%if %{with arts}
 %{_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
+%endif
 %{_libdir}/libmpeg.la
 %attr(755,root,root) %{_libdir}/libmpeg.so
 %{_libdir}/libyafcore.la
@@ -972,6 +1000,7 @@
 %attr(755,root,root) %{_bindir}/yaf-vorbis
 %attr(755,root,root) %{_bindir}/yaf-yuv
 
+%if %{with arts}
 %files noatun -f noatun.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/noatun*
@@ -1004,6 +1033,7 @@
 %attr(755,root,root) %{_libdir}/libnoatuntags.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnoatuntags.so.1
 %attr(755,root,root) %{_libdir}/libwinskinvis.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1011,6 +1041,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251  2010/04/23 14:23:09  glen
+- arts bcond on files, seems only kcddb lib stays on -devel
+
 Revision 1.250  2010/04/23 09:14:51  glen
 - arts bcond, arts disabled
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdemultimedia/kdemultimedia.spec?r1=1.250&r2=1.251&f=u

