Hello community, here is the log from the commit of package tango-icon-theme for openSUSE:Factory checked in at 2012-02-20 16:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tango-icon-theme (Old) and /work/SRC/openSUSE:Factory/.tango-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tango-icon-theme", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/tango-icon-theme/tango-icon-theme.changes 2012-01-09 15:21:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.tango-icon-theme.new/tango-icon-theme.changes 2012-02-20 16:19:10.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 8 21:34:01 UTC 2012 - dims...@opensuse.org + +- Add tango-icon-theme-rsvg-2_35_2.patch and + tango-icon-theme-extras-rsvg-2_35_2.patch: Fix build with rsvg + 2.35.2. /usr/bin/rsvg was a deprecated wrapper script for a while + already and this script has been dropped with librsvg 2.35.2. +- Add libtool BuildRequires and call to autoreconf (in both tarball + extracted folders), as the patches above touch the build system. + +------------------------------------------------------------------- New: ---- tango-icon-theme-extras-rsvg-2_35_2.patch tango-icon-theme-rsvg-2_35_2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tango-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.xY3Q5f/_old 2012-02-20 16:19:11.000000000 +0100 +++ /var/tmp/diff_new_pack.xY3Q5f/_new 2012-02-20 16:19:11.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tango-icon-theme # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,12 +21,18 @@ BuildRequires: icon-naming-utils BuildRequires: intltool BuildRequires: librsvg-devel +# Needed by patch0 and patch1 +BuildRequires: libtool BuildRequires: rsvg-view BuildArch: noarch Version: 0.8.90 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-extras-0.1.1.tar.bz2 +# PATCH-FIX-UPSTREAM tango-icon-theme-rsvg-2_35_2.patch fdo#45803 dims...@opensuse.org -- Fix build with librsvg 2.35.2: /usr/bin/rsvg was a deprecated wrapper. +Patch0: tango-icon-theme-rsvg-2_35_2.patch +# PATCH-FIX-UPSTREAM tango-icon-theme-extras-rsvg-2_35_2.patch fdo#45803 dims...@opensuse.org -- Fix build with librsvg 2.35.2: /usr/bin/rsvg was a deprecated wrapper. +Patch1: tango-icon-theme-extras-rsvg-2_35_2.patch Url: http://tango.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Tango Icon Theme @@ -41,11 +47,18 @@ %prep %setup -b 1 +%patch0 -p1 +cd ../%{name}-extras-0.1.1 +%patch1 -p1 %build +# Needed by patch0. +autoreconf -fi %configure --enable-png-creation make %{?jobs:-j%jobs} cd ../%{name}-extras-0.1.1 +# Needed by patch1 +autoreconf -fi %configure --enable-png-creation make %{?jobs:-j%jobs} ++++++ tango-icon-theme-extras-rsvg-2_35_2.patch ++++++ Index: tango-icon-theme-extras-0.1.1/configure.ac =================================================================== --- tango-icon-theme-extras-0.1.1.orig/configure.ac +++ tango-icon-theme-extras-0.1.1/configure.ac @@ -68,7 +68,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-extras-0.1.1/svg2png.sh.in =================================================================== --- tango-icon-theme-extras-0.1.1.orig/svg2png.sh.in +++ tango-icon-theme-extras-0.1.1/svg2png.sh.in @@ -8,11 +8,13 @@ if [ ! -z "${ICONTEST}" ]; then fi ICONNAME=`echo ${3} | 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 -${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png +${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png ++++++ tango-icon-theme-rsvg-2_35_2.patch ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org