Tagged from libxml-cxx.rpm #26

libxml-cxx.spec.in

@@ -6,8 +6,13 @@ License: LGPL
 Group: Development/Libraries/C++
 URL: https://dev.marc.waeckerlin.org/projects/@PACKAGENAME@
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: subversion libcppunit-devel gcc-c++ doxygen graphviz texlive automake autoconf libtool make
+BuildRequires: subversion gcc-c++ doxygen graphviz texlive automake autoconf libtool make
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
+BuildRequires: cppunit-devel
+%else%if 0%{?suse_version} || 0%{?sles_version}
+BuildRequires: libcppunit-devel
+%endif%endif
 
 
 %description
@@ -19,7 +24,7 @@ This package contains only the shared libraries required at runtime.
 %setup -q
 ./configure --prefix=/usr \
             --docdir=/usr/share/doc/packages/@PACKAGENAME@ \
-            --libdir=/usr/lib
+            --libdir=/usr/%_lib
 
 %build
 make
@@ -32,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/usr/lib/@PACKAGENAME@.so.*
+/usr/%_lib/@PACKAGENAME@.so.*
 %doc
 /usr/share/doc/packages/@PACKAGENAME@/AUTHORS
 /usr/share/doc/packages/@PACKAGENAME@/COPYING
@@ -54,10 +59,10 @@ This Package contains all files required for developement.
 
 %files devel
 %defattr(-,root,root,-)
-/usr/lib/@PACKAGENAME@.so
+/usr/%_lib/@PACKAGENAME@.so
-/usr/lib/@PACKAGENAME@.a
+/usr/%_lib/@PACKAGENAME@.a
-/usr/lib/pkgconfig
+/usr/%_lib/pkgconfig
-/usr/lib/@PACKAGENAME@.la
+/usr/%_lib/@PACKAGENAME@.la
 /usr/include/
 /usr/share/pkgconfig
 %doc

src/xml-cxx/xml.hxx

@@ -1303,7 +1303,7 @@ namespace xml {
         for (xml::Node::size_type i(0); i<node->children(); ++i) {
           typename CONTAINER_TYPE::value_type tmp;
           Serialize::fromNode(&tmp, (*node)[i]); // reads into tmp
-          push_back(tmp);
+          this->push_back(tmp);
         }
         return is;
       }