Author: lisu Date: Wed Feb 10 12:33:22 2010 GMT
Module: packages Tag: DEVEL
---- Log message:
- start update to 1.7.0
- remove duplicated shared objects from main package
- more TODO
---- Files affected:
packages/ogre:
ogre.spec (1.37 -> 1.37.2.1)
---- Diffs:
================================================================
Index: packages/ogre/ogre.spec
diff -u packages/ogre/ogre.spec:1.37 packages/ogre/ogre.spec:1.37.2.1
--- packages/ogre/ogre.spec:1.37 Thu Jan 21 14:24:54 2010
+++ packages/ogre/ogre.spec Wed Feb 10 13:33:16 2010
@@ -1,6 +1,9 @@
# $Revision$, $Date$
#
-# TODO: --enable-ogre-demos?
+# TODO: - --enable-ogre-demos?
+# - enable static libs
+# - check if cmake use our flags
+# - check BRs
#
# Conditional build:
%bcond_with cg # build with cg
@@ -9,28 +12,27 @@
%undefine with_cg
%endif
+%define _rc RC1
%define _ver %(echo %{version} | tr . -)
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.0
+Release: 0.%{_rc}.1
License: LGPL
Group: Applications
-Source0: http://dl.sourceforge.net/ogre/%{name}-v%{_ver}.tar.bz2
-# Source0-md5: 9e863029f3befe013adefa7f66dbb13c
+Source0: http://dl.sourceforge.net/ogre/%{name}-v%{_ver}%{_rc}.tar.bz2
+# Source0-md5: d6c69a7b52b633cebc74b30c11954825
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 +81,9 @@
%setup -q -n %{name}
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --%{?with_cg:en}%{!?with_cg:dis}able-cg \
- --disable-devil \
- --disable-openexr
+mkdir build && cd build
+%cmake .. \
+ -DCMAKE_INSTALL_PREFIX="%{_prefix}"
%{__make}
@@ -97,6 +93,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
@@ -109,24 +106,23 @@
%postun -p /sbin/ldconfig
%files
-%defattr(644,root,root,755)
-%doc AUTHORS BUGS README INSTALL
+#%defattr(644,root,root,755)
+#%doc AUTHORS BUGS README INSTALL
%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
+#%%attr(755,root,root) %{_bindir}/rcapsdump
%dir %{_libdir}/OGRE
%attr(755,root,root) %{_libdir}/OGRE/*.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}/libCEGUIOgre*.so
+#%{_libdir}/libOgreMain.la
+#%{_libdir}/libCEGUIOgreRenderer.la
%{_includedir}/OGRE
%{_pkgconfigdir}/OGRE.pc
-%{_pkgconfigdir}/CEGUI-OGRE.pc
+%{_pkgconfigdir}/OGRE-PCZ.pc
+%{_pkgconfigdir}/OGRE-Paging.pc
%files examples
%defattr(644,root,root,755)
@@ -138,6 +134,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37.2.1 2010/02/10 12:33:16 lisu
+- start update to 1.7.0
+- 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.37.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
