From 18f06115e87e2eddb693797e67709a3545febef53d0ffa3d17f57e94e94b5206 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Mon, 2 Mar 2009 23:38:43 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/librsvg?expand=0&rev=21

---
 librsvg.changes | 11 +++++++++++
 librsvg.spec    | 38 ++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/librsvg.changes b/librsvg.changes
index e2aedea..f608616 100644
--- a/librsvg.changes
+++ b/librsvg.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Feb 28 02:38:08 CET 2009 - vuntz@novell.com
+
+- Remove BuildRequires: docbook-toys, gtk-doc
+- Remove Requires of devel package: libbz2-devel, libart_lgpl-devel
+- Remove --with-html-dir configure flag that breaks the doc
+  install, and non-existing --without-gimp flag.
+- Move rsvg binary to librsvg package.
+- Remove autoreconf call.
+- Use makeinstall.
+
 -------------------------------------------------------------------
 Sat Jan 31 15:29:26 CET 2009 - vuntz@novell.com
 
diff --git a/librsvg.spec b/librsvg.spec
index b335494..3905622 100644
--- a/librsvg.spec
+++ b/librsvg.spec
@@ -20,8 +20,6 @@
 
 Name:           librsvg
 %define xulrunner_version 190
-BuildRequires:  docbook-toys
-BuildRequires:  gtk-doc
 BuildRequires:  gtk2-devel
 BuildRequires:  libcroco-devel
 BuildRequires:  libgsf-devel
@@ -38,7 +36,7 @@ Obsoletes:      librsvg2
 BuildRequires:  mozilla-xulrunner%{xulrunner_version}-devel
 PreReq:         coreutils
 Version:        2.22.3
-Release:        5
+Release:        6
 Summary:        A Library for Rendering SVG Data
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/%{name}-%{version}.tar.bz2
 Patch1:         env-paths.diff
@@ -62,7 +60,7 @@ Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
 Provides:       librsvg2-devel
 Obsoletes:      librsvg2-devel
-Requires:       %{name} = %{version} cairo-devel libcroco-devel libbz2-devel glib2-devel gtk2-devel libgsf-devel libart_lgpl-devel
+Requires:       %{name} = %{version} cairo-devel libcroco-devel glib2-devel gtk2-devel libgsf-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      librsvg-devel-64bit
@@ -118,18 +116,13 @@ Authors:
 %patch1
 
 %build
-autoreconf -f -i
 %configure\
 	--disable-static\
-	--with-svgz\
-	--without-gimp\
-	--with-html-dir=%{_docdir}/%{name}
+	--with-svgz
 make %{?jobs:-j%jobs}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}
-cp AUTHORS COPYING ChangeLog NEWS README $RPM_BUILD_ROOT%{_docdir}/%{name}
+%makeinstall
 mv $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins $RPM_BUILD_ROOT%{_libdir}/browser-plugins
 rmdir $RPM_BUILD_ROOT%{_libdir}/mozilla
 rm $RPM_BUILD_ROOT/%{_libdir}/*.*a $RPM_BUILD_ROOT/%{_libdir}/*/*.*a $RPM_BUILD_ROOT/%{_libdir}/*/*/*/*.*a
@@ -147,17 +140,13 @@ touch var/adm/SuSEconfig/run-gtk
 
 %files
 %defattr(-,root,root)
-%doc %dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/AUTHORS
-%doc %{_docdir}/%{name}/COPYING
-%doc %{_docdir}/%{name}/ChangeLog
-%doc %{_docdir}/%{name}/NEWS
-%doc %{_docdir}/%{name}/README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %{_libdir}/*.so.*
 %{_libdir}/gtk-2.0/*/*/*.so
 
 %files -n rsvg-view
 %defattr(-,root,root)
+%{_bindir}/rsvg
 %{_bindir}/rsvg-convert
 %{_bindir}/rsvg-view
 %{_datadir}/pixmaps/*.svg
@@ -165,18 +154,27 @@ touch var/adm/SuSEconfig/run-gtk
 
 %files devel
 %defattr(-,root,root)
-# FIXME: move devhelp doc to correct place
-%doc %{_docdir}/%{name}/rsvg
-%{_bindir}/rsvg
 %{_includedir}/librsvg-2
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/gtk-doc/html/*
+# Own these repositories to not depend on gtk-doc while building:
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
 
 %files plugin
 %defattr(-,root,root)
 %{_libdir}/browser-plugins/*.so
 
 %changelog
+* Sat Feb 28 2009 vuntz@novell.com
+- Remove BuildRequires: docbook-toys, gtk-doc
+- Remove Requires of devel package: libbz2-devel, libart_lgpl-devel
+- Remove --with-html-dir configure flag that breaks the doc
+  install, and non-existing --without-gimp flag.
+- Move rsvg binary to librsvg package.
+- Remove autoreconf call.
+- Use makeinstall.
 * Sat Jan 31 2009 vuntz@novell.com
 - Remove unneeded BuildRequires: docbook-toys,
   libgnomeprintui-devel, update-desktop-files, xmlcharent