[libxml++/f15/master] upstream 2.3.2 add doc sub-package
Haïkel Guémar
hguemar at fedoraproject.org
Sat Feb 26 10:42:12 UTC 2011
commit 4e7f88e5c60dfaa31567e99c2297ea2b672c30c2
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Sat Feb 26 11:34:00 2011 +0100
upstream 2.3.2
add doc sub-package
.gitignore | 1 +
libxml++-2.33.1-autotools2.patch | 65 ++++++++++++++++++++++++++++++++++++
libxml++.spec | 68 ++++++++++++++++++++------------------
sources | 2 +-
4 files changed, 103 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c98afb6..169d8f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
libxml++-2.30.0.tar.bz2
/libxml++-2.32.0.tar.bz2
/libxml++-2.33.1.tar.bz2
+/libxml++-2.33.2.tar.bz2
diff --git a/libxml++-2.33.1-autotools2.patch b/libxml++-2.33.1-autotools2.patch
new file mode 100644
index 0000000..8b730cc
--- /dev/null
+++ b/libxml++-2.33.1-autotools2.patch
@@ -0,0 +1,65 @@
+diff --git a/Makefile.in b/Makefile.in
+index 93be806..70ada3b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -719,46 +719,46 @@ library_validators_include_HEADERS = $(h_validators_sources_public)
+
+ @ENABLE_EXAMPLES_TRUE at examples_textreader_textreader_SOURCES = examples/textreader/main.cc
+ @ENABLE_EXAMPLES_TRUE at examples_dom_build_dom_build_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dom_parse_entities_dom_parse_entities_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dom_parser_dom_parser_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dom_parser_raw_dom_parser_raw_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dom_read_write_dom_read_write_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dom_xpath_dom_xpath_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_dtdvalidation_dtdvalidation_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_import_node_import_node_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_sax_exception_sax_exception_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_sax_parser_sax_parser_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_sax_parser_build_dom_sax_parser_build_dom_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_sax_parser_entities_sax_parser_entities_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_schemavalidation_schemavalidation_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_EXAMPLES_TRUE at examples_textreader_textreader_LDADD = \
+- at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la
++ at ENABLE_EXAMPLES_TRUE@ libxml++/libxml++-$(LIBXMLXX_API_VERSION).la $(LIBXMLXX_LIBS)
+
+ @ENABLE_DOCUMENTATION_TRUE at book_name = $(LIBXMLXX_MODULE_NAME)
+ @ENABLE_DOCUMENTATION_TRUE at doc_input = $(h_sources_public)
diff --git a/libxml++.spec b/libxml++.spec
index 676dc2d..953217d 100644
--- a/libxml++.spec
+++ b/libxml++.spec
@@ -1,19 +1,19 @@
-%global apiver 2.6
+%global api_ver 2.6
Name: libxml++
-Version: 2.33.1
-Release: 2%{?dist}
+Version: 2.33.2
+Release: 1%{?dist}
Summary: C++ wrapper for the libxml2 XML parser library
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
+#Patch0: libxml++-2.33.1-autotools.patch
+Patch1: libxml++-2.33.1-autotools2.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
@@ -31,12 +31,24 @@ Requires: pkgconfig, libxml2-devel, glibmm24-devel
%description devel
This package contains the headers and libraries for libxml++ development.
+%package doc
+Summary: Documentation for %{name}, includes full API docs
+Group: Documentation
+BuildArch: noarch
+BuildRequires: doxygen, graphviz
+Requires: glibmm24-doc
+
+%description doc
+This package contains the full API documentation for %{name}.
+
%prep
%setup -q
-%patch0 -p1
+## actually the regeneration of libxml++ autotools scripts is broken
+## use patch1 as a substitute to patch0
+%patch1 -p1
# regenerate Makefile.in since we modified Makefile.am
-automake -v
+#automake -v
# fix wrong end of line
sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
@@ -45,30 +57,13 @@ sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
%configure --disable-static --enable-examples=yes
make %{?_smp_mflags}
-
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
-# Modify temporary working directories for files section.
-rm -rf _reference _examples _manual
-mkdir -m 755 _reference _examples _manual
-cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/reference/html _reference/reference
-#cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{apiver}/manual _manual/manual
-mv docs/manual/html _manual/manual
-rm -rf $RPM_BUILD_ROOT%{_docdir}
-cp -a examples _examples/examples
-
-# Delete non-working makefiles, object files, prebuilt binaries and
-# empty files.
-find _examples -type f -a \( -name Makefile\* -o -name \*.o \
- -o \( -name example -a -perm +0111 \) -o -empty \) | xargs rm -f
-find _examples -type d -name '*.libs' -o -name '.deps' | xargs rm -rf
-# fix devhelp index file
-sed -i "s#"$RPM_BUILD_ROOT"##g" \
- $RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
-sed -i "s#"/%{name}-%{apiver}/reference/html"#"/%{name}-devel-%{version}/reference"#" \
- $RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
+# fix wrong base path in devhelp index file
+sed -i "s#$RPM_BUILD_ROOT##g" \
+ $RPM_BUILD_ROOT%{_datadir}/devhelp/books/%{name}-%{api_ver}/%{name}-%{api_ver}.devhelp2
%post -p /sbin/ldconfig
@@ -89,16 +84,25 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr (-,root,root,-)
-%doc _examples/examples _reference/reference _manual/manual
+%doc
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
-%dir %{_libdir}/%{name}-%{apiver}
-%dir %{_libdir}/%{name}-%{apiver}/include
-%{_libdir}/%{name}-%{apiver}/include/*.h
-%{_datadir}/devhelp/books/%{name}-%{apiver}/%{name}-%{apiver}.devhelp2
+%{_libdir}/%{name}-%{api_ver}
+
+
+%files doc
+%defattr(-, root, root, -)
+%doc COPYING
+%doc %{_datadir}/devhelp/books/%{name}-%{api_ver}
+%doc %{_docdir}/%{name}-%{api_ver}
+
%changelog
+* Tue Feb 22 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.33.2-1
+- Update to upstream 2.33.2
+- split doc into sub-package
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.33.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index a07bc80..d10c86b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90919b5a5e92381722ef004898eba343 libxml++-2.33.1.tar.bz2
+b3ebc99c4953a18c6987ac8c4e10bdd8 libxml++-2.33.2.tar.bz2
More information about the scm-commits
mailing list