rpms/gthumb/devel gthumb-cflags.patch, NONE, 1.1 gthumb.spec, 1.109, 1.110

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gthumb/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5048

Modified Files:
	gthumb.spec 
Added Files:
	gthumb-cflags.patch 
Log Message:
Use my CFLAGS, dammit


gthumb-cflags.patch:
 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE gthumb-cflags.patch ---
diff -up gthumb-2.11.1/configure.ac.cflags gthumb-2.11.1/configure.ac
--- gthumb-2.11.1/configure.ac.cflags	2010-01-04 11:33:06.000000000 -0500
+++ gthumb-2.11.1/configure.ac	2010-01-06 12:36:05.272547516 -0500
@@ -37,8 +37,8 @@ UNIQUE_REQUIRED=1.1.2
 
 dnl ===========================================================================
 
-CFLAGS=""
-CFLAGS+="-DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES "
+CFLAGS=${CFLAGS-:""}
+CFLAGS+=" -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES "
 CFLAGS+="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED "
 
 AC_ARG_ENABLE(debug,


Index: gthumb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gthumb/devel/gthumb.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -p -r1.109 -r1.110
--- gthumb.spec	6 Jan 2010 17:13:03 -0000	1.109
+++ gthumb.spec	6 Jan 2010 17:41:38 -0000	1.110
@@ -11,11 +11,14 @@
 Summary: Image viewer, editor, organizer
 Name: gthumb
 Version: 2.11.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://gthumb.sourceforge.net
 Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
 Source1: gthumb-importer
 Source2: gthumb-importer.desktop
+# https://bugzilla.gnome.org/show_bug.cgi?id=606227
+Patch0: gthumb-cflags.patch
+
 License: GPLv2+
 Group: User Interface/X
 
@@ -40,6 +43,8 @@ BuildRequires: gphoto2-devel >= %{gphoto
 BuildRequires: libjpeg-devel
 BuildRequires: libtiff-devel
 
+BuildRequires: automake, autoconf, libtool
+
 Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
 Requires(pre): GConf2 >= %{gconf_version}
@@ -61,10 +66,13 @@ package.
 
 %prep
 %setup -q
+%patch0 -p1 -b .cflags
 
 # force regeneration
 rm -f data/gthumb.schemas
 
+autoreconf -i -f
+
 %build
 
 %ifarch s390 s390x
@@ -143,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_includedir}/gthumb-2.0
 
 %changelog
+* Wed Jan  6 2010 Matthias Clasen <mclasen at redhat.com> - 2.11.1-3
+- Use my CFLAGS, dammit
+
 * Wed Jan  6 2010 Matthias Clasen <mclasen at redhat.com> - 2.11.1-2
 - Fix up some spec file issues