packages: ogre/ogre.spec - fixed build with recent rpm macros ("PLD" build ...

qboosh qboosh at pld-linux.org
Sun May 8 10:12:24 CEST 2011


Author: qboosh                       Date: Sun May  8 08:12:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with recent rpm macros ("PLD" build type is not supported here)
- BR: boost-devel (boost_thread and boost_date_time used)
- License is MIT; package COPYING
- package cmake files in -devel
- release 3

---- Files affected:
packages/ogre:
   ogre.spec (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: packages/ogre/ogre.spec
diff -u packages/ogre/ogre.spec:1.47 packages/ogre/ogre.spec:1.48
--- packages/ogre/ogre.spec:1.47	Wed May  4 15:51:02 2011
+++ packages/ogre/ogre.spec	Sun May  8 10:12:19 2011
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
 #
-# TODO: - bconds for rest of the plugins
+# TODO: - bconds for the rest of the plugins
 #
 # Conditional build:
 %bcond_with	cg		# build with cg
@@ -14,8 +14,8 @@
 Summary(pl.UTF-8):	OGRE - zorientowany obiektowo silnik renderowania grafiki
 Name:		ogre
 Version:	1.7.2
-Release:	2
-License:	LGPL
+Release:	3
+License:	MIT
 Group:		Applications
 Source0:	http://downloads.sourceforge.net/ogre/%{name}_src_v%{_ver}.tar.bz2
 # Source0-md5:	dd6574b8d906a74950c1e05633b2e96f
@@ -24,6 +24,7 @@
 BuildRequires:	FreeImage-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	boost-devel
 %{?with_cg:BuildRequires:	cg-devel}
 BuildRequires:	cmake
 BuildRequires:	cppunit-devel >= 1.10.0
@@ -80,7 +81,9 @@
 %build
 install -d build
 cd build
-%cmake ..
+# "None" is an alias for release, but uses plain CMAKE_CXX_FLAGS; "PLD" build type is not supported
+%cmake .. \
+	-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None}
 
 %{__make}
 
@@ -93,8 +96,6 @@
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/OGRE/*.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -103,7 +104,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS README
+%doc AUTHORS BUGS COPYING README
 %attr(755,root,root) %{_bindir}/Ogre*
 %dir %{_libdir}/OGRE
 %attr(755,root,root) %{_libdir}/OGRE/*.so
@@ -127,6 +128,8 @@
 %{_pkgconfigdir}/OGRE-Property.pc
 %{_pkgconfigdir}/OGRE-RTShaderSystem.pc
 %{_pkgconfigdir}/OGRE-Terrain.pc
+%dir %{_libdir}/OGRE
+%{_libdir}/OGRE/cmake
 
 %files examples
 %defattr(644,root,root,755)
@@ -138,6 +141,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.48  2011/05/08 08:12:19  qboosh
+- fixed build with recent rpm macros ("PLD" build type is not supported here)
+- BR: boost-devel (boost_thread and boost_date_time used)
+- License is MIT; package COPYING
+- package cmake files in -devel
+- release 3
+
 Revision 1.47  2011/05/04 13:51:02  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ogre/ogre.spec?r1=1.47&r2=1.48&f=u



More information about the pld-cvs-commit mailing list