rpms/kdemultimedia/devel kdemultimedia.spec,1.83.2.6,1.83.2.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
      Tag: kdemultimedia-kde4-branch
	kdemultimedia.spec 
Log Message:
still doesn't quite work, but this is as far as I got today.
%build section seems to not recognize %cmake_kde4 macro even though
/etc/rpm/macros.kde4 exists in the buildroot. ??

* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
- use macros.kde4



Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdemultimedia/devel/kdemultimedia.spec,v
retrieving revision 1.83.2.6
retrieving revision 1.83.2.7
diff -u -r1.83.2.6 -r1.83.2.7
--- kdemultimedia.spec	14 Aug 2007 17:35:37 -0000	1.83.2.6
+++ kdemultimedia.spec	17 Aug 2007 19:41:58 -0000	1.83.2.7
@@ -1,7 +1,7 @@
 
 Summary: K Desktop Environment 4 - Multimedia
 Version: 3.92.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdemultimedia
@@ -31,6 +31,9 @@
 BuildRequires: gstreamer-devel gstreamer-plugins-base-devel
 BuildRequires: kdelibs4-devel >= %{version}
 BuildRequires: kdebase4-devel >= %{version}
+# for macros.kde4
+BuildRequires: kde-filesystem
+%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: libmusicbrainz-devel
 BuildRequires: taglib-devel
@@ -58,11 +61,10 @@
 
 
 %build
+
 mkdir -p %{_target_platform}
 pushd %{_target_platform} 
-%cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  ../
+%{cmake_kde} ..
 popd
 
 make -C %{_target_platform}
@@ -94,31 +96,34 @@
 %defattr(-,root,root,-)
 %doc AUTHORS README
 %doc COPYING COPYING-DOCS COPYING.LIB
-%{_bindir}/*
-%{_datadir}/autostart/*.desktop
-%{_datadir}/applications/kde4/*.desktop
-%{_datadir}/apps/*
-%{_datadir}/config*/*
+%{_kde4_bindir}/*
+%{_kde4_datadir}/autostart/*.desktop
+%{_kde4_datadir}/applications/kde4/*.desktop
+%{_kde4_appsdir}/*
+%{_kde4_datadir}/config*/*
 %{_datadir}/dbus-1/interfaces/*
-%{_datadir}/desktop-directories/*
-%{_datadir}/kde4/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/icons/locolor/*/*/*
-%{_datadir}/icons/oxygen/*/*/*
-%{_datadir}/doc/HTML/en/*
-%{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit4_*.so
-%{_libdir}/kde4/*
-%{_sysconfdir}/xdg/menus/applications-merged/*.menu
+%{_kde4_datadir}/desktop-directories/*
+%{_kde4_datadir}/kde4/*
+%{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/locolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
+%{_kde4_docdir}/HTML/en/*
+%{_kde4_libdir}/lib*.so.*
+%{_kde4_libdir}/libkdeinit4_*.so
+%{_kde4_libdir}/kde4/*
+%{_kde4_sysconfdir}/xdg/menus/applications-merged/*.menu
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit4_*.so
+%{_kde4_includedir}/*
+%{_kde4_libdir}/lib*.so
+%exclude %{_kde4_libdir}/libkdeinit4_*.so
 
 
 %changelog
+* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-3
+- use macros.kde4
+
 * Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92.0-2
 - License: GPLv2+
 - Name: kdemultimedia4