From 422c5a30efb1ccbf474074c49f47165fd1927a2e Mon Sep 17 00:00:00 2001 From: Erik van Pienbroek Date: Feb 10 2013 14:04:45 +0000 Subject: Update to 2.24.15 and resolved bad date in %changelog rpmlint warnings --- diff --git a/.gitignore b/.gitignore index b6a257f..47d4846 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /gtk+-2.24.12.tar.xz /gtk+-2.24.13.tar.xz /gtk+-2.24.14.tar.xz +/gtk+-2.24.15.tar.xz diff --git a/gtk-automak.patch b/gtk-automak.patch deleted file mode 100644 index 034a18e..0000000 --- a/gtk-automak.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up gtk+-2.24.14/configure.in.automak gtk+-2.24.14/configure.in ---- gtk+-2.24.14/configure.in.automak 2013-01-15 18:29:09.834915289 -0500 -+++ gtk+-2.24.14/configure.in 2013-01-15 18:30:19.857912786 -0500 -@@ -44,14 +44,13 @@ AC_INIT([gtk+], [gtk_version], - [gtk+]) - - AC_CONFIG_SRCDIR([gdk/gdktypes.h]) -- -+AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS+set} - - AM_INIT_AUTOMAKE([no-define -Wno-portability dist-bzip2]) --AM_CONFIG_HEADER(config.h) - - # Support silent build rules, requires at least automake-1.11. Enable - # by either passing --enable-silent-rules to configure or passing V=0 -@@ -300,7 +299,6 @@ AM_SANITY_CHECK - - # Checks for programs. - AC_ISC_POSIX --AM_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_INSTALL - AC_PROG_MAKE_SET diff --git a/gtk2-fix-gmodule-linking.patch b/gtk2-fix-gmodule-linking.patch deleted file mode 100644 index b824df0..0000000 --- a/gtk2-fix-gmodule-linking.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- gtk/Makefile.am.orig 2012-03-09 21:30:45.576811007 +0100 -+++ gtk/Makefile.am 2012-03-09 21:31:34.518967507 +0100 -@@ -51,6 +51,7 @@ - -DGTK_DISABLE_DEPRECATED \ - -DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \ - -DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \ -+ $(GMODULE_CFLAGS) \ - $(GTK_DEBUG_FLAGS) \ - $(GTK_DEP_CFLAGS) \ - $(INCLUDED_IMMODULE_DEFINE) -@@ -120,6 +121,7 @@ - libgtkincludedir = $(includedir)/gtk-2.0/gtk - libadd = \ - $(top_builddir)/gdk/$(gdktargetlib) \ -+ $(GMODULE_LIBS) \ - $(GTK_DEP_LIBS) - deps = - diff --git a/mingw-gtk2.spec b/mingw-gtk2.spec index 47c04b8..03d1f87 100644 --- a/mingw-gtk2.spec +++ b/mingw-gtk2.spec @@ -1,8 +1,8 @@ %?mingw_package_header Name: mingw-gtk2 -Version: 2.24.14 -Release: 2%{?dist} +Version: 2.24.15 +Release: 1%{?dist} Summary: MinGW Windows Gtk2 library License: LGPLv2+ @@ -19,16 +19,9 @@ Patch1000: mingw32-gtk2-2.15.0-xbuttons.patch # Enable building a static library of GTK Patch1001: mingw32-gtk2-enable_static_build.patch -# Fix linking against modern glib2 -Patch1002: gtk2-fix-gmodule-linking.patch - # GTK doesn't support out-of-source builds Patch1003: gtk-fix-out-of-source-build.patch -# automake 1.13.1 is broken... -# Patch taken from the native gtk2 package -Patch1004: gtk-automak.patch - BuildArch: noarch BuildRequires: mingw32-filesystem >= 95 @@ -118,8 +111,6 @@ Static version of the MinGW Windows Gtk2 library. %setup -q -n gtk+-%{version} %patch1000 -p1 -%patch1002 -p0 -%patch1004 -p1 autoreconf -i --force %patch1001 -p0 @@ -307,6 +298,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gtk-2.0/modules/*.dll.a %changelog +* Sun Feb 10 2013 Erik van Pienbroek - 2.24.15-1 +- Update to 2.24.15 + * Wed Jan 16 2013 Erik van Pienbroek - 2.24.14-2 - Workaround broken automake 1.13.1 @@ -445,7 +439,7 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gtk-2.0/modules/*.dll.a * Tue Sep 1 2009 Erik van Pienbroek - 2.17.10-1 - Update to 2.17.10 -* Tue Aug 27 2009 Erik van Pienbroek - 2.17.9-1 +* Thu Aug 27 2009 Erik van Pienbroek - 2.17.9-1 - Update to 2.17.9 - Rebuild against mingw32-libjpeg 7 @@ -460,7 +454,7 @@ rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/gtk-2.0/modules/*.dll.a * Sat Jul 25 2009 Fedora Release Engineering - 2.17.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Wed Jun 20 2009 Erik van Pienbroek - 2.17.1-1 +* Wed Jun 10 2009 Erik van Pienbroek - 2.17.1-1 - Update to 2.17.1 - Use %%global instead of %%define - The -static subpackage was missing a Group: declaration diff --git a/sources b/sources index 26b77c8..9fb8d3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2c16f119ed624893ecfc3775930ae4c gtk+-2.24.14.tar.xz +68f034fb4f68086790d7488cf00e71c8 gtk+-2.24.15.tar.xz