Author: lisu Date: Fri Mar 5 15:00:03 2010 GMT Module: packages Tag: HEAD ---- Log message: - updated to final 1.7.0 final - DEVEL merge - package more files (and make all files more verbose) - clean up
---- Files affected: packages/ogre: ogre.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: packages/ogre/ogre.spec diff -u packages/ogre/ogre.spec:1.37 packages/ogre/ogre.spec:1.38 --- packages/ogre/ogre.spec:1.37 Thu Jan 21 14:24:54 2010 +++ packages/ogre/ogre.spec Fri Mar 5 15:59:57 2010 @@ -1,6 +1,6 @@ # $Revision$, $Date$ # -# TODO: --enable-ogre-demos? +# TODO: - bconds for rest of the plugins # # Conditional build: %bcond_with cg # build with cg @@ -13,24 +13,22 @@ Summary: Object-oriented Graphics Rendering Engine Summary(pl.UTF-8): OGRE - zorientowany obiektowo silnik renderowania grafiki Name: ogre -Version: 1.6.5 -Release: 1 +Version: 1.7.0p1 +Release: 0.1 License: LGPL Group: Applications -Source0: http://dl.sourceforge.net/ogre/%{name}-v%{_ver}.tar.bz2 -# Source0-md5: 9e863029f3befe013adefa7f66dbb13c +Source0: http://downloads.sourceforge.net/ogre/%{name}-v%{_ver}.tar.bz2 +# Source0-md5: ac06fcb8f550019f4f12e5ca27699063 URL: http://www.ogre3d.org/ BuildRequires: CEGUI-devel BuildRequires: FreeImage-devel BuildRequires: OpenEXR-devel BuildRequires: OpenGL-GLU-devel -BuildRequires: autoconf >= 2.50 -BuildRequires: automake %{?with_cg:BuildRequires: cg-devel} +BuildRequires: cmake BuildRequires: cppunit-devel >= 1.10.0 BuildRequires: freetype-devel >= 2.1.0 BuildRequires: libstdc++-devel -BuildRequires: libtool >= 2:1.5 BuildRequires: pkgconfig BuildRequires: xorg-lib-libXaw-devel BuildRequires: xorg-lib-libXrandr-devel @@ -79,15 +77,10 @@ %setup -q -n %{name} %build -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -%configure \ - --%{?with_cg:en}%{!?with_cg:dis}able-cg \ - --disable-devil \ - --disable-openexr +install -d build +cd build +%cmake .. \ + -DCMAKE_INSTALL_PREFIX="%{_prefix}" %{__make} @@ -97,6 +90,7 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} cp -pr Samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cd build %{__make} install \ DESTDIR=$RPM_BUILD_ROOT @@ -110,23 +104,30 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS README INSTALL +%doc AUTHORS BUGS README %attr(755,root,root) %{_bindir}/Ogre* -%attr(755,root,root) %{_bindir}/rcapsdump -%attr(755,root,root) %{_libdir}/libOgre*.so -%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so %dir %{_libdir}/OGRE %attr(755,root,root) %{_libdir}/OGRE/*.so +%attr(755,root,root) %{_libdir}/libOgreMain.so.*.*.* +%attr(755,root,root) %{_libdir}/libOgrePaging.so.*.*.* +%attr(755,root,root) %{_libdir}/libOgreProperty.so.*.*.* +%attr(755,root,root) %{_libdir}/libOgreRTShaderSystem.so.*.*.* +%attr(755,root,root) %{_libdir}/libOgreTerrain.so.*.*.* %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libOgre*.so -%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so -%{_libdir}/libOgreMain.la -%{_libdir}/libCEGUIOgreRenderer.la +%attr(755,root,root) %{_libdir}/libOgreMain.so +%attr(755,root,root) %{_libdir}/libOgrePaging.so +%attr(755,root,root) %{_libdir}/libOgreProperty.so +%attr(755,root,root) %{_libdir}/libOgreRTShaderSystem.so +%attr(755,root,root) %{_libdir}/libOgreTerrain.so %{_includedir}/OGRE %{_pkgconfigdir}/OGRE.pc -%{_pkgconfigdir}/CEGUI-OGRE.pc +%{_pkgconfigdir}/OGRE-PCZ.pc +%{_pkgconfigdir}/OGRE-Paging.pc +%{_pkgconfigdir}/OGRE-Property.pc +%{_pkgconfigdir}/OGRE-RTShaderSystem.pc +%{_pkgconfigdir}/OGRE-Terrain.pc %files examples %defattr(644,root,root,755) @@ -138,6 +139,21 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2010/03/05 14:59:57 lisu +- updated to final 1.7.0 final +- DEVEL merge +- package more files (and make all files more verbose) +- clean up + +Revision 1.37.2.2 2010/02/10 12:33:56 lisu +- add one more importand notes to previous commit log + +Revision 1.37.2.1 2010/02/10 12:33:16 lisu +- start update to 1.7.0 +- cmake build system +- remove duplicated shared objects from main package +- more TODO + Revision 1.37 2010/01/21 13:24:54 lisu - TODO ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ogre/ogre.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
