Accepting request 111828 from GNOME:Factory

Pushing G:F

OBS-URL: https://build.opensuse.org/request/show/111828
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/librsvg?expand=0&rev=45
This commit is contained in:
Stephan Kulow 2012-03-29 12:01:21 +00:00 committed by Git OBS Bridge
commit 0aa8e37e59
5 changed files with 18 additions and 56 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:84bf2a293d374711654c4472d7e1ca9e152f6b0f0def050c09b77d9d8dd2354c
size 504780

3
librsvg-2.36.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e6475e08c73e92c8bc58824e215551bd64ac5e9a492ff8c520b89c01a7ea510a
size 505372

View File

@ -1,41 +0,0 @@
Index: librsvg-2.35.0/configure.in
===================================================================
--- librsvg-2.35.0.orig/configure.in
+++ librsvg-2.35.0/configure.in
@@ -193,10 +193,10 @@ gdk_pixbuf_moduledir=
if test "$enable_pixbuf_loader" = "yes"; then
PKG_CHECK_MODULES([GDK_PIXBUF],[gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED])
- AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders],[none])
+ AC_PATH_PROG([GDK_PIXBUF_QUERYLOADERS],[gdk-pixbuf-query-loaders-64],[none])
if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then
- AC_MSG_ERROR([gdk-pixbuf-query-loaders not found in path])
+ AC_MSG_ERROR([gdk-pixbuf-query-loaders-64 not found in path])
fi
# First try the standalone gdk-pixbuf
Index: librsvg-2.35.0/configure
===================================================================
--- librsvg-2.35.0.orig/configure
+++ librsvg-2.35.0/configure
@@ -13726,8 +13726,8 @@ $as_echo "yes" >&6; }
fi
- # Extract the first word of "gdk-pixbuf-query-loaders", so it can be a program name with args.
-set dummy gdk-pixbuf-query-loaders; ac_word=$2
+ # Extract the first word of "gdk-pixbuf-query-loaders-64", so it can be a program name with args.
+set dummy gdk-pixbuf-query-loaders-64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_GDK_PIXBUF_QUERYLOADERS+:} false; then :
@@ -13769,7 +13769,7 @@ fi
if test "x$GDK_PIXBUF_QUERYLOADERS" = "xnone"; then
- as_fn_error $? "gdk-pixbuf-query-loaders not found in path" "$LINENO" 5
+ as_fn_error $? "gdk-pixbuf-query-loaders-64 not found in path" "$LINENO" 5
fi
# First try the standalone gdk-pixbuf

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Mar 26 14:37:31 UTC 2012 - vuntz@opensuse.org
- Update to version 2.36.0:
+ Bugs fixed: bgo#669563, bgo#672414, bgo#672792, bgo#672725.
- Drop librsvg-gdk-pixbuf-query-loaders-64.patch: fixed upstream,
by checking for both gdk-pixbuf-query-loaders-64 and
gdk-pixbuf-query-loaders.
- Remove automake BuildRequires: it was only needed for above
patch.
- Remove hack in %install to not install data files for an old
non-working GTK+ 3 theme: fixed upstream.
-------------------------------------------------------------------
Sat Feb 25 10:23:05 UTC 2012 - vuntz@opensuse.org

View File

@ -17,17 +17,14 @@
Name: librsvg
Version: 2.35.2
Version: 2.36.0
Release: 0
Summary: A Library for Rendering SVG Data
License: LGPL-2.0+ ; GPL-2.0+
Group: System/Libraries
Url: http://librsvg.sourceforge.net/
Source: http://download.gnome.org/sources/librsvg/2.35/%{name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/librsvg/2.36/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE librsvg-gdk-pixbuf-query-loaders-64.patch vuntz@opensuse.org -- Fix check for gdk-pixbuf-query-loaders on 64bit systems
Patch0: librsvg-gdk-pixbuf-query-loaders-64.patch
BuildRequires: automake
BuildRequires: gobject-introspection-devel
BuildRequires: pkgconfig(cairo) >= 1.2.0
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@ -128,11 +125,6 @@ http://www.w3c.org).
%prep
%setup -q
%if "%_lib" == "lib64"
%patch0 -p1
# don't have configure auto-regenerated
touch aclocal.m4
%endif
%build
%configure\
@ -143,8 +135,6 @@ make %{?jobs:-j%jobs}
%install
%makeinstall
find %{buildroot} -type f -name "*.la" -delete -print
# Do not install data files for GTK+ 3 theme that we don't have (bgo#669563)
rm -r %{buildroot}%{_datadir}/themes/bubble/gtk-3.0
%clean
rm -rf $RPM_BUILD_ROOT