--- a/ChangeLog	Mon May 14 04:48:17 2012 +0000
+++ b/ChangeLog	Tue May 22 04:42:04 2012 +0000
@@ -1,3 +1,9 @@
+2012-05-22  Rohini S  <[email protected]>
+
+	* base-specs/librsvg.spec: Fix Security CR 7088901
+	* patches/librsvg-01-sgml.diff:
+	* specs/SUNWlibrsvg.spec: Bump to 2.34.1
+
 2012-05-14  Abhijit Nath <[email protected]>
 
 	* Added patches/tiff-01-CVE-2012-1173.diff

--- a/base-specs/librsvg.spec	Mon May 14 04:48:17 2012 +0000
+++ b/base-specs/librsvg.spec	Tue May 22 04:42:04 2012 +0000
@@ -13,12 +13,12 @@
 Name:         librsvg
 License:      Library is LGPLv2, binaries are GPLv2
 Group:        System/Libraries/GNOME
-Version:      2.26.3
+Version:      2.34.1
 Release:      1 
 Distribution: Java Desktop System
 Vendor:       Gnome Community
 Summary:      Library for SVG support for GNOME
-Source:       http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.26/librsvg-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.34/librsvg-%{version}.tar.bz2
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_docdir}/librsvg
@@ -100,6 +100,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/engines/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la
+rm -rf $RPM_BUILD_ROOT%{_datadir}/themes
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -133,6 +134,8 @@
 %{_datadir}/gtk-doc/html/librsvg
 
 %changelog
+* Wed May 16 2011 - [email protected]
+- Bump to 2.34.1 to fix CR 7088901
 * Wed Jun 02 2010 - [email protected]
 - Bump to 2.26.3.
 * Sat Apr 03 2010 - [email protected]

--- a/patches/librsvg-01-sgml.diff	Mon May 14 04:48:17 2012 +0000
+++ b/patches/librsvg-01-sgml.diff	Tue May 22 04:42:04 2012 +0000
@@ -1,23 +1,11 @@
-diff -ruN librsvg-2.26.0.orig/doc/rsvg-docs.sgml librsvg-2.26.0/doc/rsvg-docs.sgml
---- librsvg-2.26.0.orig/doc/rsvg-docs.sgml	2010-01-04 22:02:50.468363918 +0000
-+++ librsvg-2.26.0/doc/rsvg-docs.sgml	2010-01-04 22:03:28.734508102 +0000
-@@ -3,7 +3,6 @@
-                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!NOTATION PNG SYSTEM "PNG">
- <!ENTITY hash "#">
--<!ENTITY % local.notation.class "| PNG">
- <!ENTITY RSVG SYSTEM "xml/rsvg.xml">
- <!ENTITY Cairo SYSTEM "xml/rsvg-cairo.xml">
- <!ENTITY GdkPixbuf SYSTEM "xml/rsvg-file-util.xml">
-diff -ruN librsvg-2.26.0.orig/doc/Makefile.am librsvg-2.26.0/doc/Makefile.am
---- librsvg-2.26.0.orig/doc/Makefile.am	2010-01-04 22:08:21.953984762 +0000
-+++ librsvg-2.26.0/doc/Makefile.am	2010-01-04 22:08:48.004437260 +0000
-@@ -19,7 +19,7 @@
- MKDB_OPTIONS= --sgml-mode --output-format=xml
+--- librsvg-2.34.0/doc/Makefile.am.orig	2011-01-01 12:18:27.000000000 +0000
++++ librsvg-2.34.0/doc/Makefile.am	2011-07-18 13:56:37.034445084 +0100
+@@ -43,7 +43,7 @@
  
- # Extra options to supply to gtkdoc-fixref
--FIXXREF_OPTIONS=
-+FIXXREF_OPTIONS=--module=$(DOC_MODULE)
- 
- # Used for dependencies
- HFILE_GLOB=$(top_srcdir)/*.h
+ # Extra options to supply to gtkdoc-fixref. Not normally needed.
+ # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+-FIXXREF_OPTIONS = \
++FIXXREF_OPTIONS = --module=$(DOC_MODULE) \
+ 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+ 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \
+ 	--extra-dir=$(GDK_PIXBUF_PREFIX)/share/gtk-doc/html/gdk-pixbuf \

--- a/specs/SUNWlibrsvg.spec	Mon May 14 04:48:17 2012 +0000
+++ b/specs/SUNWlibrsvg.spec	Tue May 22 04:42:04 2012 +0000
@@ -115,7 +115,7 @@
 
 %files
 %doc(bzip2) -d %{base_arch}/librsvg-%{version} COPYING COPYING.LIB ChangeLog NEWS
-%doc -d %{base_arch}/librsvg-%{version} MAINTAINERS README
+%doc -d %{base_arch}/librsvg-%{version} README
 %dir %attr (0755, root, other) %{_datadir}/doc
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -154,6 +154,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed May 16 2012 - [email protected]
+- Remove MAINTAINERS as it is no longer in 2.34.1
 * Wed Nov 10 2010 - [email protected]
 - Add license tag.
 * Fri Apr  3 2009 - [email protected]