X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=CEGUI.spec;h=a92427cfceb97747a9ff01a99b1b2cc0021b6bde;hb=f67ea62;hp=edf71e03cb06f113aeed068a94be342e1a2eacdc;hpb=f71f0c61473c883acec786c825689c6dfccc57e7;p=packages%2FCEGUI.git

diff --git a/CEGUI.spec b/CEGUI.spec
index edf71e0..a92427c 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -3,26 +3,30 @@
 %bcond_without	xercesc		# build XercesParser
 %bcond_without	ogre		# build without Ogre renderer
 %bcond_without	opengl		# build without OpenGL renderer
+%bcond_with	directb		# unsupported by upstream
 %bcond_with	samples		# build samples
 #
 Summary:	CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):	CEGUI - wolnodostępna biblioteka zapewniającą okienka i widgety
 Name:		CEGUI
-Version:	0.8.3
-Release:	2
+Version:	0.8.4
+Release:	3
 License:	LGPL v2.1+ (with MIT parts)
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.gz
-# Source0-md5:	142cca3648cee034e04d0f61bd9863ce
-Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.gz
-# Source1-md5:	af2931622f9222a6d945c76a84059d70
+Source0:	http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
+# Source0-md5:	344917301b5ed867a07575ee6a828667
+Source1:	http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.bz2
+# Source1-md5:	1096bf8c84bf6a22e8892ab9258c22f6
 Patch0:		pthread.patch
-Patch1:		python-sitedir.patch
-Patch2:		%{name}-glfw3.patch
+Patch1:		%{name}-glfw3.patch
+Patch2:		%{name}-python.patch
+Patch3:		x32.patch
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
-BuildRequires:	DirectFB-devel >= 1.2.0
+%{?with_directfb:BuildRequires:	DirectFB-devel >= 1.2.0}
 BuildRequires:	FreeImage-devel
+BuildRequires:	GLM
+BuildRequires:	OpenGL-devel
 BuildRequires:	SILLY-devel >= 0.1.0
 BuildRequires:	boost-devel >= 1.36.0
 BuildRequires:	boost-python-devel >= 1.36.0
@@ -32,6 +36,8 @@ BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	fribidi-devel
 BuildRequires:	freetype-devel >= 2.0
+BuildRequires:	glew-devel
+# for SampleFramework
 BuildRequires:	glfw-devel
 BuildRequires:	gtk+2-devel >= 2:2.4
 BuildRequires:	irrlicht-devel >= 1.4
@@ -46,7 +52,7 @@ BuildRequires:	ois-devel >= 1.0.0
 %endif
 BuildRequires:	pcre-devel >= 5.0
 BuildRequires:	pkgconfig
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2
 BuildRequires:	rapidxml
 BuildRequires:	sed >= 4.0
 BuildRequires:	tinyxml-devel
@@ -426,12 +432,14 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build
 cd build
 %cmake .. \
 	-DCEGUI_SAMPLES_ENABLED:BOOL=%{?with_samples:ON}%{!?with_samples:OFF} \
+	-DCEGUI_BUILD_RENDERER_DIRECTFB:BOOL=%{?with_directfb:ON}%{!?with_directfb:OFF} \
 	-DCEGUI_BUILD_RENDERER_OPENGL:BOOL=%{?with_opengl:ON}%{!?with_opengl:OFF} \
 	-DCEGUI_BUILD_RENDERER_OGRE:BOOL=%{?with_ogre:ON}%{!?with_ogre:OFF} \
 	-DCEGUI_BUILD_XMLPARSER_XERCES:BOOL=%{?with_xercesc:ON}%{!?with_xercesc:OFF} \
@@ -466,24 +474,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/README
+%doc doc/README.orig
 %attr(755,root,root) %{_libdir}/libCEGUIBase-0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCEGUIBase-0.so.2
 %attr(755,root,root) %{_libdir}/libCEGUICommonDialogs-0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCEGUICommonDialogs-0.so.2
-%attr(755,root,root) %{_libdir}/libCEGUINullRenderer-0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUINullRenderer-0.so.2
 %attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule-0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCEGUILuaScriptModule-0.so.2
 # plugins
 %dir %{_libdir}/cegui-0.8
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUICoreWindowRendererSet.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUISTBImageCodec.so
-%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUITGAImageCodec.so
 
 %files docs
 %defattr(644,root,root,755)
-%doc cegui-docs-0.8.3/*
+%doc cegui-docs-%{version}/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -491,16 +495,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libCEGUIBase-0.so
 %attr(755,root,root) %{_libdir}/libCEGUICommonDialogs-0.so
 %attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule-0.so
-%attr(755,root,root) %{_libdir}/libCEGUINullRenderer-0.so
 %dir %{_includedir}/cegui-0
 %dir %{_includedir}/cegui-0/%{name}
 %{_includedir}/cegui-0/%{name}/*.h
 %{_includedir}/cegui-0/%{name}/CommonDialogs
 %dir %{_includedir}/cegui-0/%{name}/ImageCodecModules
-%{_includedir}/cegui-0/%{name}/ImageCodecModules/STB
-%{_includedir}/cegui-0/%{name}/ImageCodecModules/TGA
 %dir %{_includedir}/cegui-0/%{name}/RendererModules
-%{_includedir}/cegui-0/%{name}/RendererModules/Null
 %{_includedir}/cegui-0/%{name}/ScriptModules
 %{_includedir}/cegui-0/%{name}/WindowRendererSets
 %{_includedir}/cegui-0/%{name}/XMLParserModules
@@ -508,7 +508,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/cegui-0/%{name}/widgets
 %{_pkgconfigdir}/CEGUI-0.pc
 %{_pkgconfigdir}/CEGUI-0-LUA.pc
-%{_pkgconfigdir}/CEGUI-0-NULL.pc
 
 %files ImageCodec-Corona
 %defattr(644,root,root,755)
@@ -562,6 +561,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUIXercesParser.so
 
+%if %{with directfb}
 %files Renderer-DirectFB
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCEGUIDirectFBRenderer-0.so.*.*.*
@@ -571,6 +571,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCEGUIDirectFBRenderer-0.so
 %{_includedir}/cegui-0/%{name}/RendererModules/DirectFB
+%endif
 
 %files Renderer-Irrlicht
 %defattr(644,root,root,755)
@@ -614,7 +615,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{py_sitedir}/cegui-0.8
 %attr(755,root,root) %{py_sitedir}/cegui-0.8/PyCEGUI.so
-%attr(755,root,root) %{py_sitedir}/cegui-0.8/PyCEGUINullRenderer.so
 
 %if %{with ogre}
 %files -n python-CEGUI-Renderer-Ogre