From e70cb10a31f8d6460ed7ed87a76085af695a1c18 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 30 Mar 2010 01:33:51 +0000
Subject: [PATCH] 2.26.1

---
 .cvsignore    |  2 +-
 librsvg2.spec | 62 ++++++++++++++++++++++++---------------------------
 sources       |  2 +-
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 963e98b..2965c45 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-librsvg-2.26.0.tar.bz2
+librsvg-2.26.1.tar.bz2
diff --git a/librsvg2.spec b/librsvg2.spec
index a44deda..1764b9a 100644
--- a/librsvg2.spec
+++ b/librsvg2.spec
@@ -10,29 +10,27 @@
 %define libgsf_version 1.6.0
 %define gnome_vfs_version 1.9.16
 
-Name: 	 librsvg2
+Name:    librsvg2
 Summary: An SVG library based on cairo
-Version: 2.26.0
-Release: 4%{?dist}
+Version: 2.26.1
+Release: 1%{?dist}
 
-License: 	LGPLv2+
-Group: 		System Environment/Libraries
-Source: 	http://download.gnome.org/sources/librsvg/2.26/librsvg-%{version}.tar.bz2
-# https://bugzilla.gnome.org/show_bug.cgi?id=609935
-Patch0:         librsvg-libs.patch
+License:        LGPLv2+
+Group:          System Environment/Libraries
+Source:         http://download.gnome.org/sources/librsvg/2.26/librsvg-%{version}.tar.bz2
 
-Requires:	gtk2 >= %{gtk2_version}
-Requires:	libxml2 >= %{libxml2_version}
-Requires:	freetype >= %{freetype_version}
+Requires:       gtk2 >= %{gtk2_version}
+Requires:       libxml2 >= %{libxml2_version}
+Requires:       freetype >= %{freetype_version}
 Requires:       cairo >= %{cairo_version}
-Requires:	libgsf >= %{libgsf_version}
-Requires(post):		gtk2 >= %{gtk2_version}
-Requires(postun):	gtk2 >= %{gtk2_version}
+Requires:       libgsf >= %{libgsf_version}
+Requires(post):         gtk2 >= %{gtk2_version}
+Requires(postun):       gtk2 >= %{gtk2_version}
 BuildRequires:  libpng-devel
-BuildRequires:	glib2-devel >= %{glib2_version}
-BuildRequires:	gtk2-devel >= %{gtk2_version}
-BuildRequires:	libxml2-devel >= %{libxml2_version}
-BuildRequires:	freetype-devel >= %{freetype_version}
+BuildRequires:  glib2-devel >= %{glib2_version}
+BuildRequires:  gtk2-devel >= %{gtk2_version}
+BuildRequires:  libxml2-devel >= %{libxml2_version}
+BuildRequires:  freetype-devel >= %{freetype_version}
 BuildRequires:  cairo-devel >= %{cairo_version}
 BuildRequires:  libgsf-devel, libcroco-devel
 BuildRequires:  libcroco >= %{libcroco_version}
@@ -41,19 +39,18 @@ BuildRequires:  libgnomeui-devel
 BuildRequires:  libgsf-devel >= %{libgsf_version}
 # grr, librsvg does not install api docs if --disable-gtk-doc
 BuildRequires:  gtk-doc
-BuildRequires:  autoconf automake libtool
 
 %description
 An SVG library based on cairo.
 
 
 %package devel
-Summary: 	Libraries and include files for developing with librsvg
-Group: 		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtk2-devel >= %{gtk2_version}
-Requires:	libxml2-devel >= %{libxml2_version}
-Requires:	freetype-devel >= %{freetype_version}
+Summary:        Libraries and include files for developing with librsvg
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+Requires:       gtk2-devel >= %{gtk2_version}
+Requires:       libxml2-devel >= %{libxml2_version}
+Requires:       freetype-devel >= %{freetype_version}
 Requires:       libgsf-devel >= %{libgsf_version}
 Requires:       libcroco-devel >=  %{libcroco_version}
 Requires:       pkgconfig
@@ -64,22 +61,18 @@ files to allow you to develop with librsvg.
 
 %prep
 %setup -q -n librsvg-%{version}
-%patch0 -p1 -b .libs
-
-autoreconf -i -f
 
 %build
 %configure --with-svgz \
-	--disable-gtk-doc \
-	--enable-gtk-theme \
-	--enable-gnome-vfs \
-	--with-croco \
+        --disable-gtk-doc \
+        --enable-gtk-theme \
+        --with-croco \
 
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/engines/libsvg.a
@@ -122,6 +115,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/rsvg
 
 %changelog
+* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.26.1-1
+- Update to 2.26.1
+
 * Sun Feb 14 2010 Matthias Clasen <mclasen@redhat.com> - 2.26.0-4
 - Add missing libs
 
diff --git a/sources b/sources
index c700c91..abcdec4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65dbd726a514fe8b797d26254b8efc1e  librsvg-2.26.0.tar.bz2
+d1da797fa0a84da9d1849bb1a1575464  librsvg-2.26.1.tar.bz2