[tango-icon-theme] Build with rsvg-convert. Fixes #992774.

[mavit]

commit 6ac18ec07ba0b366bbb4c1b62c4c6bdc802728bb
Author: Peter Oliver <git at mavit.org.uk>
Date:   Sat Aug 24 12:32:35 2013 +0100

    Build with rsvg-convert.  Fixes #992774.

 ...-icon-theme-0.8.90-rsvg-convert-configure.patch |   29 +++++++++++++++++
 tango-icon-theme-0.8.90-rsvg-convert.patch         |   34 ++++++++++++++++++++
 tango-icon-theme.spec                              |   13 ++++++-
 3 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/tango-icon-theme-0.8.90-rsvg-convert-configure.patch b/tango-icon-theme-0.8.90-rsvg-convert-configure.patch
new file mode 100644
index 0000000..7148897
--- /dev/null
+++ b/tango-icon-theme-0.8.90-rsvg-convert-configure.patch
@@ -0,0 +1,29 @@
+--- tango-icon-theme-0.8.90/configure~	2009-02-26 03:08:00.000000000 +0000
++++ tango-icon-theme-0.8.90/configure	2013-08-24 12:16:13.000000000 +0100
+@@ -6530,7 +6530,7 @@
+    fi
+ fi
+ 
+-# Check for rsvg or ksvgtopng for creating large scale bitmaps from svg
++# Check for rsvg-convert or ksvgtopng for creating large scale bitmaps from svg
+ # Check whether --enable-png-creation was given.
+ if test "${enable_png_creation+set}" = set; then
+   enableval=$enable_png_creation; enable_large_bitmaps=$enableval
+@@ -6545,7 +6545,7 @@
+ if test "x$enable_large_bitmaps" = "xyes"; then
+    if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.12.3\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.12.3") 2>&5
++  ($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.35.2") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+@@ -6554,7 +6554,7 @@
+   enable_large_bitmaps=no
+ fi
+    if test "x$enable_large_bitmaps" = "xyes"; then
+-      svgconvert_prog="rsvg"
++      svgconvert_prog="rsvg-convert"
+    else
+       svgconvert_prog="ksvgtopng"
+    fi
diff --git a/tango-icon-theme-0.8.90-rsvg-convert.patch b/tango-icon-theme-0.8.90-rsvg-convert.patch
new file mode 100644
index 0000000..6b71c38
--- /dev/null
+++ b/tango-icon-theme-0.8.90-rsvg-convert.patch
@@ -0,0 +1,34 @@
+Index: tango-icon-theme-0.8.90/configure.ac
+===================================================================
+--- tango-icon-theme-0.8.90.orig/configure.ac
++++ tango-icon-theme-0.8.90/configure.ac
+@@ -82,7 +82,7 @@ if test "x$enable_large_bitmaps" = "xyes
+    PKG_CHECK_EXISTS([librsvg-2.0 >= 2.12.3],
+                     [enable_large_bitmaps=yes], [enable_large_bitmaps=no])
+    if test "x$enable_large_bitmaps" = "xyes"; then
+-      svgconvert_prog="rsvg"
++      svgconvert_prog="rsvg-convert"
+    else
+       svgconvert_prog="ksvgtopng"
+    fi
+Index: tango-icon-theme-0.8.90/svg2png.sh.in
+===================================================================
+--- tango-icon-theme-0.8.90.orig/svg2png.sh.in
++++ tango-icon-theme-0.8.90/svg2png.sh.in
+@@ -9,12 +9,14 @@ fi
+ 
+ ICONFILE=`basename ${3}`
+ ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
+-if test `basename $SVGCONVERT` = "rsvg"; then
++if test `basename $SVGCONVERT` = "rsvg-convert"; then
+     OPTIONS="-w ${1} -h ${1}"
++    OUTPUT="-o"
+ else
+     OPTIONS="${1} ${1}"
++    OUTPUT=""
+ fi
+ 
+ echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
+-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png
+ 
diff --git a/tango-icon-theme.spec b/tango-icon-theme.spec
index ce54a1c..ad7e208 100644
--- a/tango-icon-theme.spec
+++ b/tango-icon-theme.spec
@@ -1,6 +1,6 @@
 Name:           tango-icon-theme
 Version:        0.8.90
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Icon theme from Tango Project
 Summary(de):    Symbolthema vom Tango Projekt
 Summary(es):    Iconos del Proyecto Tango
@@ -14,13 +14,17 @@ Source0:        http://tango.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 #VCS: git:git://anongit.freedesktop.org/tango/tango-icon-theme
 Patch0:         tango-icon-theme-0.8.90-transparency.patch
 
+# https://bugs.freedesktop.org/show_bug.cgi?id=45803
+Patch1:         tango-icon-theme-0.8.90-rsvg-convert.patch
+Patch2:         tango-icon-theme-0.8.90-rsvg-convert-configure.patch
+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  icon-naming-utils >= 0.8.90
 BuildRequires:  ImageMagick-devel >= 5.5.7
 BuildRequires:  intltool
-BuildRequires:  librsvg2-devel >= 2.12.3
+BuildRequires:  librsvg2-tools
 BuildRequires:  pkgconfig >= 0.19
 
 %description
@@ -39,6 +43,8 @@ Zawiera ikony Projektu Tango.
 %prep
 %setup -q
 %patch0 -p1 -b .transparency
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure --enable-png-creation
@@ -74,6 +80,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/Tango &>/dev/null || :
 
 
 %changelog
+* Sat Aug 24 2013 Peter Oliver <rpm at mavit.org.uk> - 0.8.90-10
+- Build with rsvg-convert.  Fixes #992774.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.90-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild