rpms/kdemultimedia-extras/FC-6 .cvsignore, 1.8, 1.9 kdemultimedia-extras.spec, 1.16, 1.17 sources, 1.7, 1.8 kdemultimedia-3.5.2-omit_kfile_mpeg.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdemultimedia-extras.spec sources 
Removed Files:
	kdemultimedia-3.5.2-omit_kfile_mpeg.patch 
Log Message:
* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.1
- (re)include kfile_mpeg, which includes metadata support only, no 
  (nonfree) decoder
- License: GPLv2+
- kde-3.5.7



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	5 Mar 2007 19:34:34 -0000	1.8
+++ .cvsignore	13 Aug 2007 19:33:06 -0000	1.9
@@ -1,3 +1,4 @@
 clog
 kdemultimedia-3.5.5-patched.tar.bz2
 kdemultimedia-3.5.6-patched.tar.bz2
+kdemultimedia-3.5.7-patched-2.tar.bz2


Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/kdemultimedia-extras.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- kdemultimedia-extras.spec	7 Mar 2007 15:37:41 -0000	1.16
+++ kdemultimedia-extras.spec	13 Aug 2007 19:33:06 -0000	1.17
@@ -3,7 +3,6 @@
 # * kdemultimedia-arts/arts-extras subpkg, http://bugzilla.redhat.com/191097 
 # * split free/nonfree codecs from *.mcopclass files, in particular:
 #   akodePlayObject.mcopclass, xine*.mcopclass (yuck) 
-# * -juk,-kaboodle,-noatun subpkgs?
 
 # NOTE: can only build *one* of the following at a time
 #  core: kdemultidia/kdemultimedia-devel
@@ -14,11 +13,11 @@
 #define nonfree 1
 
 %if "%{?core}" == "1"
-%define patched -patched
+%define patched -patched-2
 %endif
 
 %if "%{?extras}" == "1"
-%define patched -patched
+%define patched -patched-2
 %define _with_akode --with-akode
 %define _with_gstreamer --with-gstreamer
 ## not currently compatible with libtunepimp-0.5 (only libtunepimp-0.4)
@@ -63,19 +62,19 @@
 #if "%{?core}" == "1"
 Epoch:	 6
 #endif
-Version: 3.5.6
-Release: 5%{?dist}%{?kde}
+Version: 3.5.7
+Release: 1%{?dist}.1
 
-License: GPL
+License: GPLv2+
 %if "%{?patched:1}" == "1"
 %define nonfree_bits mpeglib mpeglib_artsplugin mpg123_artsplugin
 ## To generate -patched tarball,
-# 1. tar xjf kdemultimedia-%{version}
+# 1. tar xjf kdemultimedia-%{version}.tar.bz2
 # 2. mv kdemultimedia-%{version} kdemultimedia-%{version}-patched
 # 3. (cd kdemultimedia-%{version}-patched; rm -rf %nonfree_bits )
 # 4. remove %nonfree_bits from kdemultimedia-%{version}-patched/subdirs
 # 5. tar cjf kdemultimedia-%{version}-patched.tar.bz2 kdemultimedia-%{version}-patched
-Source0: kdemultimedia-%{version}-patched.tar.bz2
+Source0: kdemultimedia-%{version}%{?patched}.tar.bz2
 %else
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 %endif
@@ -113,8 +112,6 @@
 ## kde-redhat patches
 # unconditinally include oggvorbis_artsplugin 
 Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.patch
-# exclude kfile_mpeg
-Patch1001: kdemultimedia-3.5.2-omit_kfile_mpeg.patch
 # increase buffers to minimize audio cut-outs, http://bugs.kde.org/74744
 Patch74744: kdemultimedia-3.2.2-mpeglib-buffer.patch
 
@@ -154,7 +151,7 @@
 %{summary}, including: 
 * akode_artsplugin (akode)
 * juk %{?_with_musicbrainz:(libtunepimp)}
-* kfile-plugins: flac, mp3 (taglib), mpc (taglib)
+* kfile-plugins: flac, mp3 (taglib), mpc (taglib), mpeg
 * xine_artsplugin (xine-lib)
 %endif
 
@@ -187,10 +184,6 @@
 #patch1000   -p1 -b .oggvorbis_artsplugin
 %{?nonfree:%patch74744  -p1 -b .74744}
 
-%if "%{?patched:1}" != "1"
-%patch1001 -p1 -b .omit_kfile_mpeg
-%endif
-
 %if "%{is_release}" != "1"
   make -f admin/Makefile.common cvs
 %endif
@@ -424,9 +417,11 @@
 %{_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.*
@@ -502,6 +497,12 @@
 
 
 %changelog
+* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-1.1
+- (re)include kfile_mpeg, which includes metadata support only, no 
+  (nonfree) decoder
+- License: GPLv2+
+- kde-3.5.7
+
 * Wed Mar  7 2007 Michael Schwendt <mschwendt[AT]users.sf.net> 6:3.5.6-5
 - fix the fatal "Conflicts" with kdemultimedia-extras-nonfree, which
   breaks upgrades - the package does not have Epoch 6 (#231237)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia-extras/FC-6/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Feb 2007 20:24:45 -0000	1.7
+++ sources	13 Aug 2007 19:33:06 -0000	1.8
@@ -1 +1 @@
-bbbf0d6f568242b3bd3a232895a9663c  kdemultimedia-3.5.6-patched.tar.bz2
+087610cce1f0b3f5ea9fbdb3b8120377  kdemultimedia-3.5.7-patched-2.tar.bz2


--- kdemultimedia-3.5.2-omit_kfile_mpeg.patch DELETED ---