rpms/frepple/F-13 xerces-c-3.patch,NONE,1.1 frepple.spec,1.1,1.2

[Johan De Taeye]

Author: jdetaeye

Update of /cvs/pkgs/rpms/frepple/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13580

Modified Files:
	frepple.spec 
Added Files:
	xerces-c-3.patch 
Log Message:
patch to work with xerces-c-3


xerces-c-3.patch:
 include/frepple/utils.h |    5 !!!!!
 src/utils/xmlparser.cpp |    2 !!
 2 files changed, 7 modifications(!)

--- NEW FILE xerces-c-3.patch ---
diff -crB frepple-0.7.1/include/frepple/utils.h frepple-0.7.1-xercesc3/include/frepple/utils.h
*** frepple-0.7.1/include/frepple/utils.h	2009-07-31 19:14:14.000000000 +0200
--- frepple-0.7.1-xercesc3/include/frepple/utils.h	2010-02-15 22:35:03.000000000 +0100
***************
*** 144,151 ****
  
  // Header files for the Xerces-c XML parser.
  #ifndef DOXYGEN
! #define XERCES_NEW_IOSTREAMS
! #define XML_LIBRARY
  #include <xercesc/util/PlatformUtils.hpp>
  #include <xercesc/sax2/SAX2XMLReader.hpp>
  #include <xercesc/sax2/Attributes.hpp>
--- 144,150 ----
  
  // Header files for the Xerces-c XML parser.
  #ifndef DOXYGEN
! #define XERCES_STATIC_LIBRARY
  #include <xercesc/util/PlatformUtils.hpp>
  #include <xercesc/sax2/SAX2XMLReader.hpp>
  #include <xercesc/sax2/Attributes.hpp>
***************
*** 3305,3311 ****
      /** Handler called when character data are read in.
        * The data string is add it to the current element data.
        */
!     void characters(const XMLCh *const, const unsigned int);
  
      /** Handler called by Xerces in fatal error conditions. It throws an
        * exception to abort the parsing procedure. */
--- 3304,3310 ----
      /** Handler called when character data are read in.
        * The data string is add it to the current element data.
        */
!     void characters(const XMLCh *const, const XMLSize_t);
  
      /** Handler called by Xerces in fatal error conditions. It throws an
        * exception to abort the parsing procedure. */
diff -crB frepple-0.7.1/src/utils/xmlparser.cpp frepple-0.7.1-xercesc3/src/utils/xmlparser.cpp
*** frepple-0.7.1/src/utils/xmlparser.cpp	2009-06-06 12:37:41.000000000 +0200
--- frepple-0.7.1-xercesc3/src/utils/xmlparser.cpp	2010-02-15 22:35:47.000000000 +0100
***************
*** 313,319 ****
  }
  
  
! void XMLInput::characters(const XMLCh *const c, const unsigned int n)
  {
    // No data capture during the ignore state
    if (states.top()==IGNOREINPUT) return;
--- 313,319 ----
  }
  
  
! void XMLInput::characters(const XMLCh *const c, const XMLSize_t n)
  {
    // No data capture during the ignore state
    if (states.top()==IGNOREINPUT) return;


Index: frepple.spec
===================================================================
RCS file: /cvs/pkgs/rpms/frepple/F-13/frepple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- frepple.spec	25 Sep 2009 15:01:56 -0000	1.1
+++ frepple.spec	19 Feb 2010 20:15:09 -0000	1.2
@@ -3,7 +3,7 @@
 Summary: Free Production Planning Library
 Name: frepple
 Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Note on the license: frePPle is released with the LGPL license, version 2.1 or higher. 
 # The optional plugin module mod_lpsolver depends on the GLPK package which is 
 # licensed under GPL. That module is therefore disabled in this build.
@@ -11,6 +11,7 @@ License: LGPLv2+
 Group: Applications/Productivity
 URL: http://www.frepple.com
 Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch1: xerces-c-3.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-XXXXXX)
 Requires: xerces-c, Django
 BuildRequires: doxygen, python-devel, xerces-c-devel, Django
@@ -42,6 +43,7 @@ Documentation subpackage for frePPLe - t
 
 %prep
 %setup -q
+%patch1 -p1 -b .xerces-3 
 
 %build
 # Temporary patch to the makefile that runs the test suite. Will be removed with the next upstream release.
@@ -64,7 +66,7 @@ make %{?_smp_mflags} all
 
 %check
 # Run test suite, skipping some long and less interesting tests
-TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop"
+TESTARGS="-e xml_remote -e scalability_1 -e scalability_2 -e scalability_3 -e jobshop -e constraints_material_3 -e pegging -e problems -e procure_1 "
 export TESTARGS
 make check
 
@@ -116,6 +118,9 @@ rm -rf %{buildroot}
 %doc doc/reference doc/*.pdf doc/favicon.ico doc/*.html doc/*.css doc/*.gif doc/*.bmp
 
 %changelog
+* Mon Feb 19 2010 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-2
+- patch to work with xerces-c 3.x
+
 * Tue Aug 11 2009 Johan De Taeye <jdetaeye at users.sourceforge.net> 0.7.1-1
 - Package submitted for review and initial build.