Merge branch 'f9'

Conflicts:
	.gitignore
	xmlroff.spec

.gitignore

@@ -1 +1,2 @@
 xmlroff-0.5.2.tar.gz
+xmlroff-0.6.0.tar.gz

sources

@@ -1 +1 @@
-44149659ebbcec493a110f264738ea14  xmlroff-0.5.2.tar.gz
+6c026721723c1805997fbad2e179c032  xmlroff-0.6.0.tar.gz

xmlroff-0.6.0-nolibxslt.patch

@@ -0,0 +1,12 @@
+diff -up xmlroff-0.6.0/libfo-0.6.pc.in.nolibxslt xmlroff-0.6.0/libfo-0.6.pc.in
+--- xmlroff-0.6.0/libfo-0.6.pc.in.nolibxslt	2008-03-18 21:32:55.000000000 +0100
++++ xmlroff-0.6.0/libfo-0.6.pc.in	2010-11-03 14:55:57.932616318 +0100
+@@ -10,7 +10,7 @@ compat_stylesheet=@prefix@/share/xml/lib
+ Name: libfo
+ Description: XSL formatter library for xmlroff
+ Version: @VERSION@
+-Requires: @GNOMEPRINT_REQUIRES@ glib-2.0 gobject-2.0 gmodule-2.0 libxslt gdk-pixbuf-2.0
++Requires: @GNOMEPRINT_REQUIRES@ glib-2.0 gobject-2.0 gmodule-2.0 libxml-2.0 gdk-pixbuf-2.0
+ Libs: -L${libdir} -lfo-@LT_RELEASE@ @GNOMEPRINT_LIBS@
+ Cflags: -I${pkgincludedir} @GNOMEPRINT_CFLAGS@
+ 

xmlroff.spec

@@ -1,14 +1,14 @@
 Name:           xmlroff
-Version:        0.5.2
-Release:        5%{?dist}
+Version:        0.6.0
+Release:        0%{?dist}
 Summary:        A XSL-FO processor
 
 Group:          Applications/Publishing
 License:        BSD
 URL:            http://xmlroff.org/
 Source0:        http://xmlroff.org/download/%{name}-%{version}.tar.gz
-Patch0:         xmlroff-0.5.2-rpath.patch
-Patch1:         xmlroff-0.5.2-nolibxslt.patch
+Patch0:         xmlroff-%{version}-rpath.patch
+Patch1:         xmlroff-%{version}-nolibxslt.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt-devel gtk2-devel gtk-doc
@@ -49,7 +49,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{_bindir}/install -p"
-rm $RPM_BUILD_ROOT%{_libdir}/libfo-0.5.la
+rm $RPM_BUILD_ROOT%{_libdir}/libfo-*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -67,22 +67,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/%{name}/*.css
 %{_datadir}/gtk-doc/html/%{name}/*.png
 %{_datadir}/gtk-doc/html/%{name}/*.sgml
-%{_datadir}/xml/libfo-0.5.2/%{name}.*
+%{_datadir}/xml/libfo-%{version}/%{name}.*
 
 %files -n libfo
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS TODO
-%dir %{_datadir}/xml/libfo-0.5.2
-%{_datadir}/xml/libfo-0.5.2/catalog.xml
-%{_datadir}/xml/libfo-0.5.2/libfo-compat.xsl
-%{_libdir}/libfo-0.5.so.*
+%dir %{_datadir}/xml/libfo-%{version}
+%{_datadir}/xml/libfo-%{version}/catalog.xml
+%{_datadir}/xml/libfo-%{version}/libfo-compat.xsl
+%{_libdir}/libfo-*.so.*
 
 %files -n libfo-devel
 %defattr(-,root,root,-)
 %{_datadir}/gtk-doc/html/%{name}/%{name}.devhelp*
-%{_includedir}/libfo-0.5
-%{_libdir}/libfo-0.5.so
-%{_libdir}/pkgconfig/libfo-0.5.pc
+%{_includedir}/libfo-*
+%{_libdir}/libfo-0.*.so
+%{_libdir}/pkgconfig/libfo-0.*.pc
 
 %changelog
 * Sun Sep 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.5.2-5
@@ -91,10 +91,10 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Nov  9 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5.2-4
 - Added requirement of libxml2-devel in libfo-devel
 
-* Sat Nov  3 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5.2-3
+* Sat Nov  3 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5-3
 - Removed requirement of libxslt-devel in libfo-devel
 
-* Wed Oct 24 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5.2-2
+* Wed Oct 24 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5-2
 - Added libfo as requirement to xmlroff
 - Added calls to ldconfig
 - Added documents to libfo
@@ -102,5 +102,5 @@ rm -rf $RPM_BUILD_ROOT
 - Added make argument to preserve timestamps
 - Moved .pc file to libfo-devel
 
-* Tue Aug 28 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5.2-1
+* Tue Aug 28 2007 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> 0.5-1
 - Initial RPM release