From 9752ba87d0147db62a008fe9d2e0f9eb5d5728be Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 23 2015 17:29:21 +0000 Subject: Update to 3.4.1 --- diff --git a/.gitignore b/.gitignore index 644317e..5abf79b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ gthumb-2.11.6.tar.bz2 /gthumb-3.3.2.tar.xz /gthumb-3.2.8.tar.xz /gthumb-3.4.0.tar.xz +/gthumb-3.4.1.tar.xz diff --git a/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch b/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch deleted file mode 100644 index 1ca3b74..0000000 --- a/0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch +++ /dev/null @@ -1,77 +0,0 @@ -From c70d92bb721b680f2009e33412a2b8d169a7edcf Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 16 Apr 2015 13:00:55 +0200 -Subject: [PATCH] configure: Clear out ldflags before ac_check_lib() calls - -This fixes the Fedora 23 build where the cflags and ldflags have to -match. Otherwise, if ac_check_lib checks throw away cflags but use -ldflags, the checks fail with linker errors. - -https://bugzilla.gnome.org/show_bug.cgi?id=747982 ---- - configure.ac | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 7890d61..db67766 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -177,11 +177,15 @@ AC_SUBST(GTHUMB_CFLAGS) - dnl =========================================================================== - - SAVE_CFLAGS="$CFLAGS" -+SAVE_LDFLAGS="$LDFLAGS" - CFLAGS="" -+LDFLAGS="" - AC_CHECK_LIB(m, floor,, AC_MSG_ERROR([math library not found])) - M_LIBS="-lm" - CFLAGS="$SAVE_CFLAGS" -+LDFLAGS="$SAVE_LDFLAGS" - unset SAVE_CFLAGS -+unset SAVE_LDFLAGS - AC_SUBST(M_LIBS) - - dnl =========================================================================== -@@ -378,7 +382,9 @@ AC_ARG_ENABLE([jpeg], - [enable_jpeg=yes]) - if test "x$enable_jpeg" = "xyes"; then - SAVE_CFLAGS="$CFLAGS" -+ SAVE_LDFLAGS="$LDFLAGS" - CFLAGS="" -+ LDFLAGS="" - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, - [enable_jpeg=yes], - [enable_jpeg=no]) -@@ -387,7 +393,9 @@ if test "x$enable_jpeg" = "xyes"; then - JPEG_LIBS='-ljpeg -lm -lz' - fi - CFLAGS="$SAVE_CFLAGS" -+ LDFLAGS="$SAVE_LDFLAGS" - unset SAVE_CFLAGS -+ unset SAVE_LDFLAGS - fi - AC_SUBST(JPEG_LIBS) - AM_CONDITIONAL(ENABLE_JPEG_TOOLS, test "x$enable_jpeg" = xyes) -@@ -422,7 +430,9 @@ AC_ARG_ENABLE([tiff], - [enable_tiff=yes]) - if test x$enable_tiff = xyes ; then - SAVE_CFLAGS="$CFLAGS" -+ SAVE_LDFLAGS="$LDFLAGS" - CFLAGS="" -+ LDFLAGS="" - AC_CHECK_LIB(tiff, TIFFWriteScanline, - [AC_CHECK_HEADER(tiffio.h, - [enable_tiff=yes], -@@ -433,7 +443,9 @@ if test x$enable_tiff = xyes ; then - TIFF_LIBS='-ltiff -lm -lz' - fi - CFLAGS="$SAVE_CFLAGS" -+ LDFLAGS="$SAVE_LDFLAGS" - unset SAVE_CFLAGS -+ unset SAVE_LDFLAGS - fi - AC_SUBST(TIFF_LIBS) - AM_CONDITIONAL(ENABLE_TIFF, test "x$enable_tiff" = xyes) --- -2.3.5 - diff --git a/gthumb.spec b/gthumb.spec index 42fb252..aee2b56 100644 --- a/gthumb.spec +++ b/gthumb.spec @@ -1,12 +1,10 @@ Summary: Image viewer, editor, organizer Name: gthumb -Version: 3.4.0 -Release: 5%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Epoch: 1 URL: https://wiki.gnome.org/Apps/gthumb Source0: http://download.gnome.org/sources/gthumb/3.4/%{name}-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=747982 -Patch0: 0001-configure-Clear-out-ldflags-before-ac_check_lib-call.patch License: GPLv2+ Group: User Interface/X @@ -50,8 +48,6 @@ package. %prep %setup -q -%patch0 -p1 -autoreconf -fi %build %configure --disable-static @@ -111,6 +107,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/aclocal/* %changelog +* Wed Sep 23 2015 Kalev Lember - 1:3.4.1-1 +- Update to 3.4.1 + * Thu Aug 20 2015 Jon Ciesla - 1:3.4.0-5 - Rebuild for new LibRaw. diff --git a/sources b/sources index 9e6fabe..f2d93cc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c920d76705094141a339c97b9df8d3e7 gthumb-3.4.0.tar.xz +18a69695434c5066719223b69c96a16e gthumb-3.4.1.tar.xz