rpms/kdemultimedia-extras/devel kdemultimedia-extras.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25340

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-3
- -extras: move kfile_mp3 here (no decoding, only metadata via taglib)
- -extras: Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3 
  (to highlight move of xine_artsplugin, kfile_mp3 from there)



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/kdemultimedia-extras.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdemultimedia-extras.spec	12 Feb 2007 19:41:51 -0000	1.14
+++ kdemultimedia-extras.spec	12 Feb 2007 20:32:59 -0000	1.15
@@ -26,6 +26,8 @@
 %define _with_libsamplerate --with-libsamplerate
 %define _with_taglib --with-taglib
 %define _with_xine --with-xine
+# moved xine_artsplugin,kfile_mp3 from there -- Rex
+Conflicts: kdemultimedia-extras-nonfree < 6:3.5.6-3
 %endif
 
 %if "%{?nonfree}" == "1"
@@ -62,7 +64,7 @@
 Epoch:	 6
 #endif
 Version: 3.5.6
-Release: 2%{?dist}%{?kde}
+Release: 3%{?dist}%{?kde}
 
 License: GPL
 %if "%{?patched:1}" == "1"
@@ -152,7 +154,7 @@
 %{summary}, including: 
 * akode_artsplugin (akode)
 * juk %{?_with_musicbrainz:(libtunepimp)}
-* kfile-plugins: flac, mpc (taglib)
+* kfile-plugins: flac, mp3 (taglib), mpc (taglib)
 * xine_artsplugin (xine-lib)
 %endif
 
@@ -165,7 +167,7 @@
 %description
 %{summary}, including:
 * akode_artsplugin (akode-extras),
-* kfile-plugins: mp3 (taglib), mpeg
+* kfile-plugins: mpeg
 * krec mp3 export (lame),
 * mpeglib_artsplugin,
 %endif
@@ -238,13 +240,13 @@
 %endif
 
 %if "%{?extras}" == "1"
-for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do
+for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc xine_artsplugin ; do
 make %{?_smp_mflags} -C $module
 done
 %endif
 
 %if "%{?nonfree}" == "1"
-for module in arts akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ;  do
+for module in arts akode_artsplugin kfile-plugins/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ;  do
 make %{?_smp_mflags} -C $module
 done
 %endif
@@ -258,7 +260,7 @@
 %endif
 
 %if "%{?extras}" == "1"
-for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mpc xine_artsplugin ; do
+for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc xine_artsplugin ; do
 make install DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 ## Remove/uninstall (conflicting) bits we don't want
@@ -266,7 +268,7 @@
 %endif
 
 %if "%{?nonfree}" == "1"
-for module in akode_artsplugin kfile-plugins/mp3 kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do
+for module in akode_artsplugin kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do
 make install DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 ## Remove/unstinstall (conflicting) bits we don't want
@@ -419,8 +421,10 @@
 # kfile-plugins
 %{_libdir}/kde3/kfile_flac.*
 %{_libdir}/kde3/kfile_mpc.*
+%{_libdir}/kde3/kfile_mp3.*
 %{_datadir}/services/kfile_flac.desktop
 %{_datadir}/services/kfile_mpc.desktop
+%{_datadir}/services/kfile_mp3.desktop
 # akode_artsplugin (free bits)
 %{_libdir}/libarts_akode.[ls][ao]
 %{_libdir}/libarts_akode.so.*
@@ -453,12 +457,10 @@
 %{_bindir}/yaf-tplay
 %{_bindir}/yaf-vorbis
 %{_bindir}/yaf-yuv
-%{_libdir}/kde3/kfile_mp3.[ls][ao]
 %{_libdir}/kde3/kfile_mpeg.[ls][ao]
 %{_libdir}/kde3/libkrecexport_mp3.[ls][ao]
 %{_libdir}/libyafcore.[ls][ao]
 %{_libdir}/libyafxplayer.[ls][ao]
-%{_datadir}/services/kfile_mp3.desktop
 %{_datadir}/services/kfile_mpeg.desktop
 %{_datadir}/services/krec_exportmp3.desktop
 
@@ -498,6 +500,11 @@
 
 
 %changelog
+* Mon Feb 12 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-3
+- -extras: move kfile_mp3 here (no decoding, only metadata via taglib)
+- -extras: Conflicts: kdemultimedia-extras-nonfree < 3.5.6-3 
+  (to highlight move of xine_artsplugin, kfile_mp3 from there)
+
 * Sat Jan 20 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.6-2
 - use gst 0.10 instead of gst08 (where available)