Author: cactus                       Date: Sun Nov 11 14:12:21 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond xercesc
- BuildConflicts: xerces-c-devel >= 2.8.0
- Conflicts:    xerces-c >= 2.8.0
- builds now with/without xerces-c (2.7.0)
- updated TODO

---- Files affected:
SPECS:
   CEGUI.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/CEGUI.spec
diff -u SPECS/CEGUI.spec:1.9 SPECS/CEGUI.spec:1.10
--- SPECS/CEGUI.spec:1.9        Sat Oct 20 01:45:51 2007
+++ SPECS/CEGUI.spec    Sun Nov 11 15:12:16 2007
@@ -3,11 +3,11 @@
 # - gcc33 patch only for AC-branch
 # - ogre-renderer (BR: CEGUI-OGRE >= 1.0.0 through pkgconfig)
 # - maybe we should make subpackages? For example CEGUI-OPENGL (smc.spec)?
-# - doesn't build (too newest xerces?):
-#   CEGUIXercesParser.cpp: In static member function 
-#   'static void 
CEGUI::XercesParser::initialiseSchema(xercesc_2_8::SAX2XMLReader*,
-#   const CEGUI::String&, const CEGUI::String&, const CEGUI::String&)':
-#   CEGUIXercesParser.cpp:233: error: incomplete type 'xercesc_2_8::Grammar' 
used in nested name specifier
+# - if You want have irrlight renderer enabled pass CC=athlon-pld-linux-g++ to 
configure
+#      because irrlight.h test is compiled by CC
+#
+# Conditional build:
+%bcond_with    xercesc
 #
 Summary:       CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):     CEGUI - wolnodostępna biblioteka zapewniającą okienka i 
widgety
@@ -16,8 +16,8 @@
 Release:       1
 License:       LGPL
 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: c4ad1d85a7fe1de1b907c2a49a592010
 Source1:       
http://dl.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
 # Source1-md5: e268b5812f146ee1ff9ba4c07ff501b7
 Patch0:                %{name}-gcc33.patch
@@ -40,7 +40,11 @@
 BuildRequires: lua50-devel >= 5.0
 BuildRequires: pcre-devel >= 5.0
 BuildRequires: pkgconfig
+%if %{with xercesc}
 BuildRequires: xerces-c-devel
+BuildConflicts: xerces-c-devel >= 2.8.0
+Conflicts:     xerces-c >= 2.8.0
+%endif
 # for irrlicht
 BuildRequires: xorg-lib-libXxf86vm-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -89,7 +93,12 @@
 %{__automake}
 %configure \
        --with-default-image-codec=FreeImageImageCodec \
-       --with-default-parser=LibxmlParser
+       --with-default-parser=LibxmlParser \
+%if %{with xercesc}
+       --enable-xerces-c
+%else
+       --disable-xerces-c
+%endif
 
 %{__make}
 
@@ -125,6 +134,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007-11-11 14:12:16  cactus
+- bcond xercesc
+- BuildConflicts: xerces-c-devel >= 2.8.0
+- Conflicts:    xerces-c >= 2.8.0
+- builds now with/without xerces-c (2.7.0)
+- updated TODO
+
 Revision 1.9  2007-10-19 23:45:51  arvenil
 - doesn't build, added TODO
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to