[mingw-libxml++: 10/24] update to 2.33.1 to match native

[Kalev Lember]

commit 9f9ef3c1061d5c5ac64710c2d404d232293503a5
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date:   Wed Dec 8 12:27:09 2010 +0100

    update to 2.33.1 to match native

 .gitignore                      |    1 +
 libxml++-2.33.1-autotools.patch |   66 +++++++++++++++++++++++++++++++++++++++
 mingw32-libxml++.spec           |   23 +++++++++++--
 sources                         |    2 +-
 4 files changed, 87 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41e07bc..f5c8bea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libxml++-2.26.0.tar.bz2
 libxml++-2.30.0.tar.bz2
+/libxml++-2.33.1.tar.bz2
diff --git a/libxml++-2.33.1-autotools.patch b/libxml++-2.33.1-autotools.patch
new file mode 100644
index 0000000..b1e6fd5
--- /dev/null
+++ b/libxml++-2.33.1-autotools.patch
@@ -0,0 +1,66 @@
+diff --git a/Makefile.am b/Makefile.am
+index 218faeb..10d37f7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -150,33 +150,47 @@ examples_schemavalidation_schemavalidation_SOURCES = \
+ examples_textreader_textreader_SOURCES = examples/textreader/main.cc
+ 
+ examples_dom_build_dom_build_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dom_parse_entities_dom_parse_entities_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dom_parser_dom_parser_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dom_parser_raw_dom_parser_raw_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dom_read_write_dom_read_write_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dom_xpath_dom_xpath_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_dtdvalidation_dtdvalidation_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_import_node_import_node_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_sax_exception_sax_exception_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_sax_parser_sax_parser_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_sax_parser_entities_sax_parser_entities_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_schemavalidation_schemavalidation_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ examples_textreader_textreader_LDADD = \
+-	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++	libxml++/libxml++-$(LIBXMLXX_API_VERSION).la \
++	$(LIBXMLXX_LIBS)
+ endif # ENABLE_EXAMPLES
+ 
+ docs/manual/libxml++.xml: docs/manual/libxml++_without_code.xml docs/manual/insert_example_code.pl
diff --git a/mingw32-libxml++.spec b/mingw32-libxml++.spec
index 6efb2bb..3bf7327 100644
--- a/mingw32-libxml++.spec
+++ b/mingw32-libxml++.spec
@@ -8,7 +8,7 @@
 %global name1 libxml++
 
 Name:           mingw32-%{name1}
-Version:        2.30.0
+Version:        2.33.1
 Release:        1%{?dist}
 Summary:        MinGW Windows C++ wrapper for the libxml2 XML parser library
 
@@ -16,7 +16,8 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://libxmlplusplus.sourceforge.net/
 Source:         http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.26/libxml++-%{version}.tar.bz2
-Patch0:         libxml++-mingw32.patch
+Patch0:         libxml++-2.33.1-autotools.patch
+Patch1:         libxml++-mingw32.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,10 +26,13 @@ BuildRequires:  mingw32-libxml2 >= 2.6.1
 BuildRequires:  mingw32-glibmm24 >= 2.4.0
 BuildRequires:  doxygen
 BuildRequires:  graphviz
+BuildRequires:  automake
+BuildRequires:  mm-common
 BuildRequires:  mingw32-filesystem >= 52
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-gcc-c++
+BuildRequires:  mingw32-gettext
 
 Requires:       pkgconfig
 
@@ -43,10 +47,18 @@ and Murray Cumming.
 
 %prep
 %setup -q -n %{name1}-%{version}
-%patch0 -p0 -b .mingw32
+%patch0 -p1 -b .auto
+%patch1 -p0 -b .mingw32
+libtoolize -f -c
+aclocal
+autoconf
+# regenerate Makefile.in since we modified Makefile.am
+automake -a -c
+# fix wrong end of line
+sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
-%{_mingw32_configure} --disable-static --disable-documentation
+%{_mingw32_configure} --disable-static --disable-documentation --disable-examples
 make %{?_smp_mflags}
 
 
@@ -73,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Dec  8 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.33.1-1
+- update to 2.33.1
+
 * Thu Aug  5 2010 Thomas Sailer <t.sailer at alumni.ethz.ch> - 2.30.0-1
 - update to 2.30.0
 
diff --git a/sources b/sources
index deb13a4..a07bc80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ae752b65c016391cbca40bc73bcc67c0  libxml++-2.30.0.tar.bz2
+90919b5a5e92381722ef004898eba343  libxml++-2.33.1.tar.bz2