rpms/kdemultimedia/devel kdemultimedia.spec,1.83.2.4,1.83.2.5

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdemultimedia-kde4-branch
	kdemultimedia.spec 
Log Message:
* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
- License: GPLv2+
- Name: kdemultimedia4



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.83.2.4
retrieving revision 1.83.2.5
diff -u -r1.83.2.4 -r1.83.2.5
--- kdemultimedia.spec	29 Jul 2007 20:34:22 -0000	1.83.2.4
+++ kdemultimedia.spec	9 Aug 2007 17:54:13 -0000	1.83.2.5
@@ -1,11 +1,19 @@
 
-Name:    kdemultimedia
-Epoch:   6
+Summary: K Desktop Environment 4 - Multimedia
 Version: 3.92.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-Summary: K Desktop Environment 4 - Multimedia 
-License: GPL
+%if 0%{?fedora} > 8
+Name: kdemultimedia
+Epoch: 6
+Obsoletes: kdemultimedia4 < %{version}-%{release}
+Provides:  kdemultimedia4 = %{version}-%{release}
+%else
+Name: kdemultimedia4
+%endif
+
+# FIXME: libs = LGPLv2+, apps = GPLv2+ ??
+License: GPLv2+
 URL:     http://www.kde.org/
 Group:   Applications/Multimedia
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
@@ -29,8 +37,6 @@
 %if 0%{?fedora} > 7
 BuildRequires: libxcb-devel
 %endif
-## FIXME/TODO
-#BuildRequiers: nmm-devel
 
 %description
 Multimedia for the K Desktop Environment 4.
@@ -51,9 +57,6 @@
 
 
 %build
-# what's this for?  not included in current qt4 packaging anyway -- Rex
-#unset QMAKESPEC && source /etc/profile.d/qt.sh
-
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
 %cmake \
@@ -115,6 +118,10 @@
 
 
 %changelog
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
+- License: GPLv2+
+- Name: kdemultimedia4
+
 * Sat Jul 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-1
 - kde-3.92.0 (kde-4-beta1)