rpms/kdemultimedia-extras/FC-6 .cvsignore, 1.9, 1.10 kdemultimedia-extras.spec, 1.21, 1.22 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kdemultimedia-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20263

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Log Message:
* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1
- kde-3.5.8



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Aug 2007 19:33:06 -0000	1.9
+++ .cvsignore	7 Dec 2007 15:18:13 -0000	1.10
@@ -2,3 +2,4 @@
 kdemultimedia-3.5.5-patched.tar.bz2
 kdemultimedia-3.5.6-patched.tar.bz2
 kdemultimedia-3.5.7-patched-2.tar.bz2
+kdemultimedia-3.5.8-patched.tar.bz2


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- kdemultimedia-extras.spec	13 Aug 2007 22:07:16 -0000	1.21
+++ kdemultimedia-extras.spec	7 Dec 2007 15:18:13 -0000	1.22
@@ -13,11 +13,11 @@
 #define nonfree 1
 
 %if "%{?core}" == "1"
-%define patched -patched-2
+%define patched -patched
 %endif
 
 %if "%{?extras}" == "1"
-%define patched -patched-2
+%define patched -patched
 %define _with_akode --with-akode
 %define _with_gstreamer --with-gstreamer
 ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
@@ -62,8 +62,8 @@
 #if "%{?core}" == "1"
 Epoch:	 6
 #endif
-Version: 3.5.7
-Release: 1%{?dist}.5
+Version: 3.5.8
+Release: 1%{?dist}
 
 License: GPLv2+
 %if "%{?patched:1}" == "1"
@@ -153,7 +153,7 @@
 %{summary}, including: 
 * akode_artsplugin (akode)
 * juk %{?_with_musicbrainz:(libtunepimp)}
-* kfile-plugins: flac, mp3 (taglib), mpc (taglib), mpeg
+* kfile-plugins: flac, mp3 (taglib), mpc (taglib)
 * xine_artsplugin (xine-lib)
 %endif
 
@@ -237,13 +237,13 @@
 %endif
 
 %if "%{?extras}" == "1"
-for module in arts akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc kfile-plugins/mpeg 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/mpeg krec krec/mp3_export mpeglib mpeglib_artsplug ;  do
+for module in arts akode_artsplugin krec krec/mp3_export mpeglib mpeglib_artsplug ;  do
 make %{?_smp_mflags} -C $module
 done
 %endif
@@ -257,7 +257,7 @@
 %endif
 
 %if "%{?extras}" == "1"
-for module in akode_artsplugin juk kfile-plugins/flac kfile-plugins/mp3 kfile-plugins/mpc kfile-plugins/mpeg  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
@@ -265,7 +265,7 @@
 %endif
 
 %if "%{?nonfree}" == "1"
-for module in akode_artsplugin kfile-plugins/mpeg krec/mp3_export mpeglib mpeglib_artsplug ; do
+for module in akode_artsplugin krec/mp3_export mpeglib mpeglib_artsplug ; do
 make install DESTDIR=$RPM_BUILD_ROOT -C $module
 done
 ## Remove/unstinstall (conflicting) bits we don't want
@@ -421,11 +421,9 @@
 %{_libdir}/kde3/kfile_flac.*
 %{_libdir}/kde3/kfile_mpc.*
 %{_libdir}/kde3/kfile_mp3.*
-%{_libdir}/kde3/kfile_mpeg.*
 %{_datadir}/services/kfile_flac.desktop
 %{_datadir}/services/kfile_mpc.desktop
 %{_datadir}/services/kfile_mp3.desktop
-%{_datadir}/services/kfile_mpeg.desktop
 # akode_artsplugin (free bits)
 %{_libdir}/libarts_akode.[ls][ao]
 %{_libdir}/libarts_akode.so.*
@@ -458,11 +456,9 @@
 %{_bindir}/yaf-tplay
 %{_bindir}/yaf-vorbis
 %{_bindir}/yaf-yuv
-%{_libdir}/kde3/kfile_mpeg.[ls][ao]
 %{_libdir}/kde3/libkrecexport_mp3.[ls][ao]
 %{_libdir}/libyafcore.[ls][ao]
 %{_libdir}/libyafxplayer.[ls][ao]
-%{_datadir}/services/kfile_mpeg.desktop
 %{_datadir}/services/krec_exportmp3.desktop
 
 # (akode|mpeglib|xine)_artsplugin (nonfree bits)
@@ -501,6 +497,9 @@
 
 
 %changelog
+* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.8-1
+- kde-3.5.8
+
 * Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.5
 - (re)include kfile_mpeg, which includes metadata support only, no 
   (nonfree) decoder


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	13 Aug 2007 19:33:06 -0000	1.8
+++ sources	7 Dec 2007 15:18:13 -0000	1.9
@@ -1 +1 @@
-087610cce1f0b3f5ea9fbdb3b8120377  kdemultimedia-3.5.7-patched-2.tar.bz2
+09451109c854e34ba237d8d267f7bbd2  kdemultimedia-3.5.8-patched.tar.bz2