rpms/libprojectM-qt/devel libprojectM-qt.spec,1.4,1.5

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/libprojectM-qt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25768

Modified Files:
	libprojectM-qt.spec 
Log Message:
* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
- cleanup %cmake macro usage
- %files: track file and sonames closer
- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)



Index: libprojectM-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libprojectM-qt/devel/libprojectM-qt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- libprojectM-qt.spec	25 Jul 2009 08:29:30 -0000	1.4
+++ libprojectM-qt.spec	20 Sep 2009 17:38:04 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		libprojectM-qt
 Version:	1.2.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The Qt frontend to the projectM visualization plugin
 Group:		Applications/Multimedia
 License:	GPLv2+
@@ -20,7 +20,7 @@ preset playlists for projectM-jack and p
 %package	devel
 Summary:	Development files for %{name}
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt-devel
+Requires:	%{name} = %{version}-%{release}, pkgconfig, libprojectM-devel, qt4-devel
 
 %description	devel
 projectM-qt is a GUI designed to enhance the projectM user and preset writer
@@ -34,13 +34,17 @@ developing applications that use %{name}
 %patch0 -p1
 
 %build
-%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir} .
-make %{?_smp_mflags} VERBOSE=1
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform} 
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
 %clean
@@ -54,17 +58,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/*.so.*
+%{_libdir}/libprojectM-qt.so.1*
 %{_datadir}/pixmaps/prjm16-transparent.svg
 
 %files devel
 %defattr(-,root,root,-)
 %doc ReadMe
-%{_includedir}/%{name}
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libprojectM-qt/
+%{_libdir}/libprojectM-qt.so
+%{_libdir}/pkgconfig/libprojectM-qt.pc
 
 %changelog
+* Sun Sep 20 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.2.0-7
+- cleanup %%cmake macro usage
+- %%files: track file and sonames closer
+- FTBFS libprojectM-qt-1.2.0-5.fc11 (#511744)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild