SPECS: CEGUI.spec - up to 0.6.0 - patch1 and patch2 disabled - works with x...

[cactus]

Author: cactus                       Date: Thu May 22 22:59:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.6.0
- patch1 and patch2 disabled
- works with xerces-c >= 2.8
- build with xerces-c enabled now 
- bcond samples disabled by default (samples with old api)
- bcond ogre disabled by default (ogre3d used for samples)
- ogre need BR: ois-devel and ogre-devel
- some clean'up in configure options

---- Files affected:
SPECS:
   CEGUI.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/CEGUI.spec
diff -u SPECS/CEGUI.spec:1.12 SPECS/CEGUI.spec:1.13
--- SPECS/CEGUI.spec:1.12	Wed Dec 26 18:27:09 2007
+++ SPECS/CEGUI.spec	Fri May 23 00:59:19 2008
@@ -5,19 +5,21 @@
 # - maybe we should make subpackages? For example CEGUI-OPENGL (smc.spec)?
 #
 # Conditional build:
-%bcond_with	xercesc		# build XercesParser
+%bcond_without	xercesc		# build XercesParser
+%bcond_with	ogre		# build samples with ogre3d
+%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.5.0
+Version:	0.6.0
 Release:	1
 License:	LGPL v2.1+ (with MIT parts)
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/crayzedsgui/%{name}-%{version}b.tar.gz
-# Source0-md5:	b42322a33c6a06eede76b15f75694a17
+Source0:	http://dl.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.gz
+# Source0-md5:	a7772b20a4e3530298e3e28c4eaec1bb
 Source1:	http://dl.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
-# Source1-md5:	e268b5812f146ee1ff9ba4c07ff501b7
+# Source1-md5:	8abece86ea0b8a52737579ac2e801978
 Patch0:		%{name}-gcc33.patch
 Patch1:		%{name}-link.patch
 Patch2:		%{name}-irrlicht.patch
@@ -39,13 +41,15 @@
 BuildRequires:	lua50-devel >= 5.0
 BuildRequires:	pcre-devel >= 5.0
 BuildRequires:	pkgconfig
+%if %{with ogre}
+BuildRequires:	ois-devel
+BuildRequires:	ogre-devel
+%endif
 # for irrlicht renderer
 BuildRequires:	xorg-lib-libXxf86vm-devel
 Requires:	irrlicht >= 1.4
 %if %{with xercesc}
 BuildRequires:	xerces-c-devel
-BuildConflicts: xerces-c-devel >= 2.8.0
-Conflicts:	xerces-c >= 2.8.0
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -83,8 +87,8 @@
 %prep
 %setup -q -b 1
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -95,11 +99,9 @@
 %configure \
 	--with-default-image-codec=FreeImageImageCodec \
 	--with-default-parser=LibxmlParser \
-%if %{with xercesc}
-	--enable-xerces-c
-%else
-	--disable-xerces-c
-%endif
+	%{!?with_samples:--disable-samples} \
+	%{!?with_ogre:--without-ogre-renderer} \
+	--%{?with_xercesc:en}%{!?with_xercesc:dis}able-xerces-c
 
 %{__make}
 
@@ -135,6 +137,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2008-05-22 22:59:19  cactus
+- up to 0.6.0
+- patch1 and patch2 disabled
+- works with xerces-c >= 2.8
+- build with xerces-c enabled now
+- bcond samples disabled by default (samples with old api)
+- bcond ogre disabled by default (ogre3d used for samples)
+- ogre need BR: ois-devel and ogre-devel
+- some clean'up in configure options
+
 Revision 1.12  2007-12-26 17:27:09  qboosh
 - added irrlicht patch (fix + update for irrlicht 1.4)
 - License is LGPL v2.1+, most of code is MIT
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/CEGUI.spec?r1=1.12&r2=1.13&f=u