X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=CEGUI.spec;h=c5f09eff37c6524820758b02e806a3587fb8203d;hb=d050fb3e00eb22ca9d29cbec7f357eba3753a871;hp=07f66b1eaec74765075e1aad2ef598818fb4f9a7;hpb=cbbebc2277b5bcb4f7397b53060273b63759db01;p=packages%2FCEGUI.git

diff --git a/CEGUI.spec b/CEGUI.spec
index 07f66b1..c5f09ef 100644
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -1,31 +1,32 @@
 # TODO:
 # - external tinyxml
 # - external tolua++
-# - ogre-renderer (BR: CEGUI-OGRE >= 1.0.0 through pkgconfig)
-# - maybe we should make subpackages? For example CEGUI-OPENGL (smc.spec)?
 #
 # Conditional build:
 %bcond_without	xercesc		# build XercesParser
-%bcond_with	ogre		# build samples with ogre3d
+%bcond_with	ogre		# build without Ogre renderer
+%bcond_without	opengl		# build without OpenGL renderer
 %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.6.1
-Release:	2
+Version:	0.7.3
+Release:	1
 License:	LGPL v2.1+ (with MIT parts)
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.gz
-# Source0-md5:	aee37f8532ecbdc0b87efbaebafdf148
-Source1:	http://dl.sourceforge.net/crayzedsgui/%{name}-%{version}-DOCS.tar.gz
-# Source1-md5:	e0fe06bb43e00c5d7b278e7167740bd7
-Patch0:		%{name}-link.patch
+Source0:	http://downloads.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.gz
+# Source0-md5:	8b0ff8b7a67127327c55a00f02a42d0d
+Source1:	http://downloads.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
+# Source1-md5:	7872daacaddf44f883017929dbc75f2d
 URL:		http://www.cegui.org.uk/
 BuildRequires:	DevIL-devel
+BuildRequires:	DirectFB-devel
 BuildRequires:	FreeImage-devel
+%if %{with opengl}
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-glut-devel
+%endif
 BuildRequires:	SILLY-devel >= 0.1.0
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -73,6 +74,8 @@ Summary:	Development files for CEGUI
 Summary(pl.UTF-8):	Pliki programistyczne dla CEGUI
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+%{?with_ogre:Requires:	%{name}-Ogre = %{version}-%{release}}
+%{?with_opengl:Requires:	%{name}-OpenGL = %{version}-%{release}}
 Requires:	freetype-devel >= 2.0
 Requires:	libstdc++-devel
 Requires:	pcre-devel >= 5.0
@@ -95,10 +98,32 @@ CEGUI documentation.
 %description docs -l pl.UTF-8
 Dokumentacja CEGUI.
 
+%package OpenGL
+Summary:	OpenGLRenderer library for CEGUI
+Summary(pl.UTF-8):	Biblioteka OpenGLRenderer dla CEGUI
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description OpenGL
+OpenGLRenderer library for CEGUI.
+
+%description OpenGL -l pl.UTF-8
+Biblioteka OpenGLRenderer dla CEGUI.
+
+%package Ogre
+Summary:	OgreRenderer library for CEGUI
+Summary(pl.UTF-8):	Biblioteka OgreRenderer dla CEGUI
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Ogre
+OgreRenderer library for CEGUI.
+
+%description Ogre -l pl.UTF-8
+Biblioteka OgreRenderer dla CEGUI
 
 %prep
-%setup -q -b 1
-%patch0 -p1
+%setup -q -a 1
 
 %build
 %{__libtoolize}
@@ -110,7 +135,8 @@ Dokumentacja CEGUI.
 	--with-default-image-codec=FreeImageImageCodec \
 	--with-default-xml-parser=LibxmlParser \
 	%{!?with_samples:--disable-samples} \
-	%{!?with_ogre:--without-ogre-renderer} \
+	--%{?with_ogre:en}%{!?with_ogre:dis}able-ogre-renderer \
+	--%{?with_opengl:en}%{!?with_opengl:dis}able-opengl-renderer \
 	--%{?with_xercesc:en}%{!?with_xercesc:dis}able-xerces-c
 
 %{__make}
@@ -129,81 +155,72 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
-# libs
-%attr(755,root,root) %{_libdir}/libCEGUIBase.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIBase.so.1
-%attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIOpenGLRenderer.so.0
+%doc doc/README
+%attr(755,root,root) %{_libdir}/libCEGUIBase-%{version}.so
 # plugins
-%attr(755,root,root) %{_libdir}/libCEGUICoronaImageCodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUICoronaImageCodec.so.0
-%attr(755,root,root) %{_libdir}/libCEGUICoronaImageCodec.so
-%attr(755,root,root) %{_libdir}/libCEGUIDevILImageCodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIDevILImageCodec.so.0
+%attr(755,root,root) %{_libdir}/libCEGUIDevILImageCodec-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIDevILImageCodec.so
-%attr(755,root,root) %{_libdir}/libCEGUIExpatParser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIExpatParser.so.0
+%attr(755,root,root) %{_libdir}/libCEGUIExpatParser-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIExpatParser.so
-%attr(755,root,root) %{_libdir}/libCEGUIFalagardWRBase.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIFalagardWRBase.so.1
+%attr(755,root,root) %{_libdir}/libCEGUIFalagardWRBase-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIFalagardWRBase.so
-%attr(755,root,root) %{_libdir}/libCEGUIFreeImageImageCodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIFreeImageImageCodec.so.0
+%attr(755,root,root) %{_libdir}/libCEGUIFreeImageImageCodec-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIFreeImageImageCodec.so
-%attr(755,root,root) %{_libdir}/libCEGUIIrrlichtRenderer.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIIrrlichtRenderer.so.0
+%attr(755,root,root) %{_libdir}/libCEGUIIrrlichtRenderer-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIIrrlichtRenderer.so
-%attr(755,root,root) %{_libdir}/libCEGUILibxmlParser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUILibxmlParser.so.0
+%attr(755,root,root) %{_libdir}/libCEGUILibxmlParser-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUILibxmlParser.so
-%attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUILuaScriptModule.so.1
-%attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule.so
-%attr(755,root,root) %{_libdir}/libCEGUISILLYImageCodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUISILLYImageCodec.so.0
+%attr(755,root,root) %{_libdir}/libCEGUISILLYImageCodec-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUISILLYImageCodec.so
-%attr(755,root,root) %{_libdir}/libCEGUITGAImageCodec.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUITGAImageCodec.so.0
+%attr(755,root,root) %{_libdir}/libCEGUISTBImageCodec-%{version}.so
+%attr(755,root,root) %{_libdir}/libCEGUISTBImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUITGAImageCodec-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUITGAImageCodec.so
-%attr(755,root,root) %{_libdir}/libCEGUITinyXMLParser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUITinyXMLParser.so.0
+%attr(755,root,root) %{_libdir}/libCEGUITinyXMLParser-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUITinyXMLParser.so
-%attr(755,root,root) %{_libdir}/libCEGUIXercesParser.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUIXercesParser.so.0
+%attr(755,root,root) %{_libdir}/libCEGUIXercesParser-%{version}.so
 %attr(755,root,root) %{_libdir}/libCEGUIXercesParser.so
-%attr(755,root,root) %{_libdir}/libCEGUItoluapp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libCEGUItoluapp.so.1
-%attr(755,root,root) %{_libdir}/libCEGUItoluapp.so
 
 %files docs
 %defattr(644,root,root,755)
-%doc documentation
+%doc docs/CEGUI-DOCS-%{version}
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/XMLRefSchema
-%{_datadir}/%{name}/XMLRefSchema/*.xsd
-%{_datadir}/%{name}/XMLRefSchema/Readme.txt
+%dir %{_datadir}/%{name}/xml_schemas
+%{_datadir}/%{name}/xml_schemas/*.xsd
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCEGUIBase.so
-%attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer.so
+%{?with_ogre:%attr(755,root,root) %{_libdir}/libCEGUIOgreRenderer.so}
+%{?with_opengl:%attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer.so}
 %{_libdir}/libCEGUIBase.la
-%{_libdir}/libCEGUIOpenGLRenderer.la
+%{?with_ogre:%{_libdir}/libCEGUIOgreRenderer.la}
+%{?with_opengl:%{_libdir}/libCEGUIOpenGLRenderer.la}
 # plugins - but as their headers are included...
-%{_libdir}/libCEGUICoronaImageCodec.la
 %{_libdir}/libCEGUIDevILImageCodec.la
 %{_libdir}/libCEGUIExpatParser.la
 %{_libdir}/libCEGUIFalagardWRBase.la
 %{_libdir}/libCEGUIFreeImageImageCodec.la
 %{_libdir}/libCEGUIIrrlichtRenderer.la
 %{_libdir}/libCEGUILibxmlParser.la
-%{_libdir}/libCEGUILuaScriptModule.la
 %{_libdir}/libCEGUISILLYImageCodec.la
+%{_libdir}/libCEGUISTBImageCodec.la
 %{_libdir}/libCEGUITGAImageCodec.la
 %{_libdir}/libCEGUITinyXMLParser.la
 %{_libdir}/libCEGUIXercesParser.la
-%{_libdir}/libCEGUItoluapp.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/CEGUI.pc
-%{_pkgconfigdir}/CEGUI-OPENGL.pc
+%{?with_opengl:%{_pkgconfigdir}/CEGUI-OPENGL.pc}
+%{?with_ogre:%{_pkgconfigdir}/CEGUI-OGRE.pc}
+
+%if %{with opengl}
+%files OpenGL
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer-%{version}.so
+%endif
+
+%if %{with ogre}
+%files Ogre
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libCEGUIOgreRenderer-%{version}.so
+%endif