rpms/kdemultimedia/devel kdemultimedia.spec,1.83.2.1,1.83.2.2

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdemultimedia-kde4-branch
	kdemultimedia.spec 
Log Message:
* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
- BR: libxcb-devel
- fix/avoid epochs, kdelibs->kdelibs4, kdebase->kdebase4



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.83.2.1
retrieving revision 1.83.2.2
diff -u -r1.83.2.1 -r1.83.2.2
--- kdemultimedia.spec	26 Jul 2007 17:22:25 -0000	1.83.2.1
+++ kdemultimedia.spec	26 Jul 2007 18:17:20 -0000	1.83.2.2
@@ -1,11 +1,13 @@
-Name: kdemultimedia
-Epoch: 6
+
+Name:    kdemultimedia
+Epoch:   6
 Version: 3.91.0
-Release: 1%{?dist}
+Release: 2%{?dist}
+
 Summary: K Desktop Environment 4 - Multimedia 
 License: GPL
-URL: http://www.kde.org/
-Group: Applications/Multimedia
+URL:     http://www.kde.org/
+Group:   Applications/Multimedia
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdemultimedia-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -13,9 +15,9 @@
 Requires(post): /sbin/ldconfig xdg-utils
 Requires(postun): /sbin/ldconfig xdg-utils
 
-BuildRequires: cmake 
-BuildRequires: kdelibs-devel
-BuildRequires: kdebase-devel
+BuildRequires: cmake
+BuildRequires: kdelibs4-devel >= %{version}
+BuildRequires: kdebase4-devel >= %{version}
 BuildRequires: alsa-lib-devel
 BuildRequires: cdparanoia cdparanoia-devel
 BuildRequires: flac-devel
@@ -24,6 +26,11 @@
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: taglib-devel
 BuildRequires: xine-lib-devel
+%if 0%{?fedora} > 7
+BuildRequires: libxcb-devel
+%endif
+## FIXME/TODO
+#BuildRequiers: nmm-devel
 
 %description
 Multimedia for the K Desktop Environment 4.
@@ -31,11 +38,10 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 multimedia applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: kdelibs-devel
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: kdelibs4-devel
 Obsoletes: kdemultimedia4-devel < %{version}-%{release}
-Provides: kdemultimedia4-devel = %{version}-%{release}
-
+Provides:  kdemultimedia4-devel = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -43,8 +49,10 @@
 %prep
 %setup -q -n kdemultimedia-%{version}
 
+
 %build
-unset QMAKESPEC && source /etc/profile.d/qt.sh
+# 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} 
@@ -101,11 +109,15 @@
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/
+%{_includedir}/*
 %{_libdir}/lib*.so
 %exclude %{_libdir}/libkdeinit4_*.so
 
 
 %changelog
+* Thu Jul 26 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.91.0-2
+- BR: libxcb-devel
+- fix/avoid epochs, kdelibs->kdelibs4, kdebase->kdebase4
+
 * Thu Jul 26 2007 Than Ngo <than at redhat.com> 3.91.0-1
 - kde-3.91.0 - kde4 alpha2