rpms/kdemultimedia/devel .cvsignore, 1.37, 1.38 kdemultimedia.spec, 1.84, 1.85 sources, 1.39, 1.40

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kdemultimedia.spec sources 
Log Message:
* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
- (re)include kfile_mp3, kfile_mpeg, which includes metadata support only
  (not nonfree decoders).
- License: GPLv2+
- Provides: kdemultimedia3(-devel) ...



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	16 Jun 2007 23:38:43 -0000	1.37
+++ .cvsignore	13 Aug 2007 13:50:09 -0000	1.38
@@ -1,16 +1,3 @@
-kdemultimedia-3.3.0-patched.tar.bz2
-kdemultimedia-3.3.1-patched.tar.bz2
-kdemultimedia-3.3.2-patched.tar.bz2
-kdemultimedia-3.4.0-patched-rc1.tar.bz2
-kdemultimedia-3.4.0-patched.tar.bz2
-kdemultimedia-3.4.1-patched.tar.bz2
-kdemultimedia-3.4.2-patched.tar.bz2
-kdemultimedia-3.4.91-patched.tar.bz2
-kdemultimedia-3.4.92-patched.tar.bz2
-kdemultimedia-3.5.0.tar.bz2
-kdemultimedia-3.5.0-patched.tar.bz2
-kdemultimedia-3.5.1-patched.tar.bz2
-kdemultimedia-3.5.2-patched.tar.bz2
-kdemultimedia-3.5.3-patched.tar.bz2
-kdemultimedia-3.5.4-patched.tar.bz2
+kdemultimedia-3.5.7.tar.bz2
 kdemultimedia-3.5.7-patched.tar.bz2
+kdemultimedia-3.5.7-patched-2.tar.bz2


Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- kdemultimedia.spec	13 Aug 2007 12:08:44 -0000	1.84
+++ kdemultimedia.spec	13 Aug 2007 13:50:09 -0000	1.85
@@ -1,6 +1,5 @@
 
 ## FIXME/TODO:
-# * make kdemultimedia-3.5.7-patched tarball with script/instructions
 # * kdemultimedia-arts/arts-extras subpkg, http://bugzilla.redhat.com/191097
 # * split free/nonfree codecs from *.mcopclass files, in particular:
 #   akodePlayObject.mcopclass, xine*.mcopclass (yuck)
@@ -22,14 +21,25 @@
 Summary: Multimedia applications for the K Desktop Environment (KDE)
 Epoch:   6
 Version: 3.5.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   Applications/Multimedia
 Url:     http://www.kde.org
-Source:  ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-patched.tar.bz2
+
+%define patch patched-2
+%define nonfree_bits mpeglib mpeglib_artsplugin mpg123_artsplugin
+## To generate -patched tarball,
+# 1. tar xjf kdemultimedia-%{version}
+# 2. mv kdemultimedia-%{version} kdemultimedia-%{version}-%{patch}
+# 3. (cd kdemultimedia-%{version}-%{patch}; rm -rf %nonfree_bits )
+# 4. remove %nonfree_bits from kdemultimedia-%{version}-%{patch}/subdirs
+# 5. tar cjf kdemultimedia-%{version}-%{patch}.tar.bz2 kdemultimedia-%{version}-%{patch}
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}-%{patch}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Provides: kdemultimedia3 = %{version}-%{release}
+
 Patch2: kdemultimedia-3.5.6-config.patch
 Patch3: kdemultimedia-3.4.0-xdg.patch
 Patch4: kdemultimedia-3.5.3-examples.patch
@@ -39,10 +49,9 @@
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires: kdebase >= 6:%{version}
 
 BuildRequires: zlib-devel
-BuildRequires: kdebase-devel >= 6:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
 BuildRequires: libvorbis-devel
 BuildRequires: audiofile-devel
 BuildRequires: desktop-file-utils
@@ -74,9 +83,11 @@
 %package devel
 Summary: Development files for aRts plugins
 Group: Development/Libraries
+Provides: kdemultimedia3-devel = %{version}-%{release}
 Requires: %{name} = %{epoch}:%{version}-%{release}
+# for noatun shlib(s)
 Requires: %{name}-extras = %{epoch}:%{version}-%{release}
-Requires: kdebase-devel
+Requires: kdelibs-devel
 %description devel
 Development files for aRts and noatun plugins.
 Install kdemultimedia-devel if you wish to develop or compile any
@@ -94,7 +105,7 @@
  * noatun, a media player
 
 %prep
-%setup -q -n %{name}-%{version}-patched
+%setup -q -n %{name}-%{version}-%{patch}
 
 %patch2 -p1 -b .config
 %patch3 -p1 -b .xdg
@@ -113,8 +124,7 @@
 
 # just to be paranoid -- Rex
 DO_NOT_COMPILE=""
-export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"
+export DO_NOT_COMPILE="$DO_NOT_COMPILE %{nonfree_bits}"
 
 %configure \
    --enable-new-ldflags \
@@ -347,6 +357,12 @@
 
 
 %changelog
+* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-2
+- (re)include kfile_mp3, kfile_mpeg, which includes metadata support only
+  (not nonfree decoders).
+- License: GPLv2+
+- Provides: kdemultimedia3(-devel) ...
+
 * Wed Jun 06 2007 Than Ngo <than at redhat.com> - 6:3.5.7-1
 - 3.5.7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	16 Jun 2007 23:38:43 -0000	1.39
+++ sources	13 Aug 2007 13:50:09 -0000	1.40
@@ -1 +1 @@
-ae3583937e8737a63cf86c43efa2f641  kdemultimedia-3.5.7-patched.tar.bz2
+087610cce1f0b3f5ea9fbdb3b8120377  kdemultimedia-3.5.7-patched-2.tar.bz2