[libxml++] upstream 2.33.1

Haïkel Guémar hguemar at fedoraproject.org
Thu Nov 25 12:34:51 UTC 2010


commit f94f3faa8a21048ea12d09b556628d0ce7de4b88
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Thu Nov 25 12:47:26 2010 +0100

    upstream 2.33.1

 .gitignore                      |    1 +
 libxml++-2.33.1-autotools.patch |   66 +++++++++++++++++++++++++++++++++++++++
 libxml++.spec                   |   15 +++++++--
 sources                         |    2 +-
 4 files changed, 80 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 961739a..c98afb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libxml++-2.30.0.tar.bz2
 /libxml++-2.32.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/libxml++.spec b/libxml++.spec
index 46d8a59..7062d69 100644
--- a/libxml++.spec
+++ b/libxml++.spec
@@ -1,6 +1,6 @@
 %global 	apiver 2.6
 Name:           libxml++
-Version:        2.32.0
+Version:        2.33.1
 Release:        1%{?dist}
 Summary:        C++ wrapper for the libxml2 XML parser library
 
@@ -8,11 +8,13 @@ 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++-2.33.1-autotools.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel >= 2.6.1
 BuildRequires:  glibmm24-devel >= 2.4.0
 BuildRequires:  doxygen, graphviz
+BuildRequires:  automake
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
@@ -32,11 +34,15 @@ This package contains the headers and libraries for libxml++ development.
 
 %prep
 %setup -q
+%patch0 -p1
+# regenerate Makefile.in since we modified Makefile.am
+automake -v
 # fix wrong end of line
 sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
-%configure --disable-static
+# examples are now enabled by default
+%configure --disable-static --enable-examples=yes
 make %{?_smp_mflags}
 
 
@@ -93,7 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
 
 %changelog
-* Fri Nov  5 2010  <hguemar at fedoraproject.org> - 2.32.0-1
+* Mon Nov 22 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 2.33.1-1
+- Update to upstream 2.33.1
+
+* Fri Nov 05 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 2.32.0-1
 - Update to upstream 2.32.0
 
 * Thu Sep 30 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 2.30.1-1
diff --git a/sources b/sources
index 8e10ee4..a07bc80 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f25c032942653211311754608abf46a4  libxml++-2.32.0.tar.bz2
+90919b5a5e92381722ef004898eba343  libxml++-2.33.1.tar.bz2


More information about the scm-commits mailing list