diff --git a/SOURCES/0001-Make-update-cache-work-better.patch b/SOURCES/0001-Make-update-cache-work-better.patch new file mode 100644 index 0000000..6c75e15 --- /dev/null +++ b/SOURCES/0001-Make-update-cache-work-better.patch @@ -0,0 +1,30 @@ +From bfb6aa74d52c369d3bc136d8d5e869ec61a748b6 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Wed, 13 Nov 2013 17:32:59 -0500 +Subject: [PATCH] Make --update-cache work better + +Due to an oversight, combining the --update-cache option with +explicitly specified modules was leading to an attempt to +open the --update-cache.so module - with predictably disappointing +results. Make this work as intended, and as described +in the man page. +--- + gdk-pixbuf/queryloaders.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c +index f1b22ce..d23654e 100644 +--- a/gdk-pixbuf/queryloaders.c ++++ b/gdk-pixbuf/queryloaders.c +@@ -374,7 +374,7 @@ int main (int argc, char **argv) + else { + char *cwd = g_get_current_dir (); + +- for (i = 1; i < argc; i++) { ++ for (i = first_file; i < argc; i++) { + char *infilename = argv[i]; + #ifdef G_OS_WIN32 + infilename = g_locale_to_utf8 (infilename, +-- +1.8.4.2 + diff --git a/SPECS/gdk-pixbuf2.spec b/SPECS/gdk-pixbuf2.spec index d3ec007..2b62c06 100644 --- a/SPECS/gdk-pixbuf2.spec +++ b/SPECS/gdk-pixbuf2.spec @@ -2,7 +2,7 @@ Name: gdk-pixbuf2 Version: 2.28.2 -Release: 1%{?dist} +Release: 4%{?dist} Summary: An image loading library Group: System Environment/Libraries @@ -11,6 +11,8 @@ URL: http://www.gt.org #VCS: git:git://git.gnome.org/gdk-pixbuf Source0: http://download.gnome.org/sources/gdk-pixbuf/2.28/gdk-pixbuf-%{version}.tar.xz +# upstream fix +Patch0: 0001-Make-update-cache-work-better.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -54,6 +56,7 @@ for writing applications that are using gdk-pixbuf. %prep %setup -q -n gdk-pixbuf-%{version} +%patch0 -p1 %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -117,6 +120,16 @@ fi %changelog +* Fri Jan 24 2014 Daniel Mach - 2.28.2-4 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 2.28.2-3 +- Mass rebuild 2013-12-27 + +* Mon Nov 18 2013 Matthias Clasen - 2.28.2-2 +- Fix interaction between --update-cache and other args +- Resolves: #1029796 + * Fri Jun 7 2013 Matthias Clasen - 2.28.2-1 - Update to 2.28.2