[libxml++/f15] backports f16 changes upstream 2.34.2 add BR mm-common fixes RHBZ #737410

[Haïkel Guémar]

commit 9c5449ac8863a85d740c7275a8769e59081bcb07
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Mon Sep 12 07:27:47 2011 +0200

    backports f16 changes
    upstream 2.34.2
    add BR mm-common
    fixes RHBZ #737410

 .gitignore                      |    8 +++--
 libxml++-2.33.1-autotools.patch |   66 ---------------------------------------
 libxml++.spec                   |   41 +++++++++---------------
 sources                         |    2 +-
 4 files changed, 22 insertions(+), 95 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 169d8f4..4df6742 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 libxml++-2.30.0.tar.bz2
-/libxml++-2.32.0.tar.bz2
-/libxml++-2.33.1.tar.bz2
-/libxml++-2.33.2.tar.bz2
+libxml++-2.32.0.tar.bz2
+libxml++-2.33.1.tar.bz2
+libxml++-2.33.2.tar.bz2
+libxml++-2.34.1.tar.bz2
+libxml++-2.34.2.tar.bz2
diff --git a/libxml++.spec b/libxml++.spec
index 953217d..28dc1ea 100644
--- a/libxml++.spec
+++ b/libxml++.spec
@@ -1,20 +1,18 @@
 %global 	api_ver 2.6
+# first two digits of version
+%define release_version %(echo %{version} | awk -F. '{print $1"."$2}')
+
 Name:           libxml++
-Version:        2.33.2
+Version:        2.34.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
-Patch1:		libxml++-2.33.1-autotools2.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/libxml++/%{release_version}/libxml++-%{version}.tar.bz2
 BuildRequires:  libxml2-devel >= 2.6.1
 BuildRequires:  glibmm24-devel >= 2.4.0
-BuildRequires:  automake
 
 %description
 libxml++ is a C++ wrapper for the libxml2 XML parser library. It's original
@@ -26,7 +24,8 @@ and Murray Cumming.
 Summary:        Development files for %{name}
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, libxml2-devel, glibmm24-devel
+Requires:       libxml2-devel
+Requires:       glibmm24-devel
 
 %description devel
 This package contains the headers and libraries for libxml++ development.
@@ -36,6 +35,7 @@ Summary:        Documentation for %{name}, includes full API docs
 Group:          Documentation
 BuildArch:      noarch
 BuildRequires:  doxygen, graphviz
+Requires:       %{name} = %{version}-%{release}
 Requires:       glibmm24-doc
 
 %description    doc
@@ -44,12 +44,6 @@ This package contains the full API documentation for %{name}.
 
 %prep
 %setup -q
-## 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
-# fix wrong end of line
 sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 
 %build
@@ -58,8 +52,7 @@ sed -i s'#\r##' examples/dom_parser/example_with_namespace.xml
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -name "*.la" -o -name '*.a' | xargs rm -f
 # fix wrong base path in devhelp index file
 sed -i "s#$RPM_BUILD_ROOT##g" \
@@ -72,19 +65,12 @@ sed -i "s#$RPM_BUILD_ROOT##g" \
 %postun -p /sbin/ldconfig
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr (-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog
 %{_libdir}/*.so.*
 
 
 %files devel
-%defattr (-,root,root,-)
-%doc
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
@@ -92,13 +78,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files doc
-%defattr(-, root, root, -)
-%doc COPYING
 %doc %{_datadir}/devhelp/books/%{name}-%{api_ver}
 %doc %{_docdir}/%{name}-%{api_ver}
 
 
 %changelog
+* Mon Sep 12 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 2.34.2-1
+- backport f16 changes (RHBZ #737410)
+- upstream 2.34.2
+- drop upstreamed patches
+- require base package from -doc subpackage
+- buildrequire mm-common for doc-install.pl
+
 * 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
diff --git a/sources b/sources
index d10c86b..12d4f22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3ebc99c4953a18c6987ac8c4e10bdd8  libxml++-2.33.2.tar.bz2
+6f87d824919e0727dc8c814bab20d03d  libxml++-2.34.2.tar.bz2