SPECS: ogre.spec - up to 1.4.1 - build with cg and CEGUI - many BR...

[arvenil]

Author: arvenil                      Date: Sat May 26 21:37:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.4.1
- build with cg and CEGUI
- many BR's
- ugly --as-needed fix (see TODO)
- fix for FreeImage's required version

---- Files affected:
SPECS:
   ogre.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/ogre.spec
diff -u SPECS/ogre.spec:1.19 SPECS/ogre.spec:1.20
--- SPECS/ogre.spec:1.19	Sat May 26 23:29:00 2007
+++ SPECS/ogre.spec	Sat May 26 23:37:11 2007
@@ -1,33 +1,41 @@
 # $Revision$, $Date$
+# TODO:
+# - better fix for --as-needed (im too stupid to fix this in a correct way:/)
+#
 %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.2.5
-Release:	1
+Version:	1.4.1
+Release:	0.1
 License:	LGPL
 Group:		Applications
 Source0:	http://dl.sourceforge.net/ogre/%{name}-linux_osx-v%{_ver}.tar.bz2
-# Source0-md5:	b4c9c0e6dda14009c8e7a29de876d9a1
+# Source0-md5:	cbabbfddc5f1a2c76480eb5fc9d87b37
 URL:		http://www.ogre3d.org/
+BuildRequires:	CEGUI-devel
 BuildRequires:	FreeImage-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	OpenGL-GLU-devel
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	cg-devel
 BuildRequires:	cppunit-devel >= 1.10.0
 BuildRequires:	freetype-devel >= 2.1.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
-# X11R7: xorg-lib-libXt-devel xorg-lib-libXaw-devel xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXxf86vm-devel
+BuildRequires:	xorg-proto-xf86vidmodeproto-devel
 BuildRequires:	zlib-devel
 BuildRequires:	zziplib-devel
-# CEGUI >= 0.3.0, http://www.cegui.org.uk/
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define         filterout_ld    -Wl,--as-needed
+
 %description
 Object-oriented Graphics Rendering Engine.
 
@@ -39,7 +47,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OGRE
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	FreeImage-devel >= 1.6.7
+Requires:	FreeImage-devel
 Requires:	freetype-devel >= 2.1.0
 Requires:	libstdc++-devel
 Requires:	zlib-devel
@@ -69,9 +77,6 @@
 find -name CVS -print0 | xargs -0 rm -rf
 
 sed -i -e 's,"-L/usr/X11R6/lib ,"-L/usr/X11R6/%{_lib} ,' acinclude.m4
-# X11R7
-#sed -i -e 's,"-L/usr/X11R6/lib ,",' acinclude.m4
-#sed -i -e 's,="-I/usr/X11R6/include",=,' acinclude.m4
 
 %build
 %{__libtoolize}
@@ -80,7 +85,6 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-cg \
 	--disable-devil \
 	--enable-openexr
 
@@ -88,6 +92,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 cp -pr Samples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -106,17 +111,20 @@
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS README INSTALL
 %attr(755,root,root) %{_bindir}/Ogre*
-%attr(755,root,root) %{_libdir}/libOgre*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libOgre*.so
+%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so
 %dir %{_libdir}/OGRE
 %attr(755,root,root) %{_libdir}/OGRE/*.so
 
 %files devel
 %defattr(644,root,root,755)
-%doc Docs/*
 %attr(755,root,root) %{_libdir}/libOgre*.so
-%{_libdir}/libOgre*.la
+%attr(755,root,root) %{_libdir}/libCEGUIOgre*.so
+%{_libdir}/libOgreMain.la
+%{_libdir}/libCEGUIOgreRenderer.la
 %{_includedir}/OGRE
 %{_pkgconfigdir}/OGRE.pc
+%{_pkgconfigdir}/CEGUI-OGRE.pc
 
 %files examples
 %defattr(644,root,root,755)
@@ -128,6 +136,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/05/26 21:37:11  arvenil
+- up to 1.4.1
+- build with cg and CEGUI
+- many BR's
+- ugly --as-needed fix (see TODO)
+- fix for FreeImage's required version
+
 Revision 1.19  2007/05/26 21:29:00  arvenil
 - swich from DevIL to FreeImage (it seems to be better maintain)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ogre.spec?r1=1.19&r2=1.20&f=u