Accepting request 105094 from GNOME:Factory

Pushing most G:F bits

OBS-URL: https://build.opensuse.org/request/show/105094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdk-pixbuf?expand=0&rev=16

gdk-pixbuf-2.25.0.tar.xz

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

gdk-pixbuf-2.25.2.tar.xz

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

gdk-pixbuf-missing-include.patch

@@ -1,20 +0,0 @@
-commit 42e18a5d35bbdcf216c03f04e83153ba9f09ec36
-Author: Vincent Untz <vuntz@gnome.org>
-Date:   Mon Dec 19 14:57:03 2011 +0100
-
-    qtif: Add missing libintl.h include
-    
-    https://bugzilla.gnome.org/show_bug.cgi?id=666518
-
-diff --git a/gdk-pixbuf/io-qtif.c b/gdk-pixbuf/io-qtif.c
-index cd2deaa..d418cfc 100644
---- a/gdk-pixbuf/io-qtif.c
-+++ b/gdk-pixbuf/io-qtif.c
-@@ -27,6 +27,7 @@
- 
- #include "config.h"
- #include <errno.h>
-+#include <libintl.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>

gdk-pixbuf.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Feb  7 16:53:33 UTC 2012 - vuntz@opensuse.org
+
+- Remove xz BuildRequires now that it comes for free in the build
+  system.
+
+-------------------------------------------------------------------
+Sun Feb  5 18:52:47 UTC 2012 - zaitor@opensuse.org
+
+- Update to version 2.25.2:
+  + New functions to load pixbufs from resources:
+    gdk_pixbuf_new_from_resource,
+    gdk_pixbuf_new_from_resource_at_scale.
+  + gdk-pixbuf-pixdata is a new program that generates raw binary
+    GdkPixdata files, and there is a new loader for these.
+  + Updated translations.
+- Drop gdk-pixbuf-missing-include.patch: fixed upstream.
+
 -------------------------------------------------------------------
 Mon Dec 19 11:43:36 UTC 2011 - vuntz@opensuse.org
 

gdk-pixbuf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package gdk-pixbuf
 #
-# 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
@@ -19,7 +19,7 @@
 %define gdk_pixbuf_binary_version 2.10.0
 
 Name:           gdk-pixbuf
-Version:        2.25.0
+Version:        2.25.2
 Release:        0
 Summary:        An image loading library
 License:        LGPL-2.1+
@@ -28,14 +28,10 @@ Source:         http://download.gnome.org/sources/gdk-pixbuf/2.25/%{name}-%{vers
 Source1:        macros.gdk-pixbuf
 Source2:        README.SUSE
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM gdk-pixbuf-missing-include.patch bgo#666518 vuntz@opensuse.org -- Add missing include
-Patch0:         gdk-pixbuf-missing-include.patch
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  translation-update-upstream
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(glib-2.0) >= 2.31.0
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(libpng)
@@ -106,10 +102,8 @@ translation-update-upstream
 %if "%_lib" == "lib64"
 cp -a %{S:2} .
 %endif
-%patch0 -p1
 
 %build
-# Needed for patch0 or when BUILD_FROM_VCS is set
 %if 0%{?BUILD_FROM_VCS}
 [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh
 %endif
@@ -208,6 +202,7 @@ fi
 %files devel
 %defattr(-, root, root)
 %{_bindir}/gdk-pixbuf-csource
+%{_bindir}/gdk-pixbuf-pixdata
 %{_mandir}/man1/gdk-pixbuf-csource.1*
 %{_includedir}/gdk-pixbuf-2.0
 %{_libdir}/pkgconfig/*.pc