From 8d90a0c466f6ccc8c31ccd308df6c9d37e13f88e Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mar 17 2009 08:31:05 +0000
Subject: require pygtk2 >= 2.10.4 (#490553) use -fno-strict-aliasing, PIC/PIE

    compilation flags

---

diff --git a/.cvsignore b/.cvsignore
index ae83314..247b3dd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gimp-2.6.5.tar.bz2
+gimp-2.6.5-gtk-version.patch.bz2
diff --git a/gimp.spec b/gimp.spec
index 19fee48..b1686c8 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -24,7 +24,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.5
-Release:        1%{?dist}
+Release:        5%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -99,6 +99,7 @@ Requires:       gimp-print-plugin
 %endif
 %endif
 Requires:       hicolor-icon-theme
+Requires:       pygtk2 >= 2.10.4
 Requires:       xdg-utils
 Requires:       gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:       gimp-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -107,6 +108,7 @@ Source0:        ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
 Source1:        gimp-plugin-mgr.in
 Patch0:         gimp-2.6.2-xdg-open.patch
 Patch1:         gimp-2.6.2-jpeg-units.patch
+Patch2:         gimp-2.6.5-gtk-version.patch.bz2
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -186,11 +188,17 @@ EOF
 %setup -q -n gimp-%{version}
 %patch0 -p1 -b .xdg-open
 %patch1 -p1 -b .jpeg-units
+%patch2 -p1 -b .gtk-version
 
 %build
 if [ ! -f configure ]; then
   ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
 fi
+# Use PIC/PIE because gimp is likely to deal with files coming from untrusted
+# sources
+CFLAGS='-fPIC %optflags -fno-strict-aliasing'
+CXXFLAGS='-fPIC %optflags -fno-strict-aliasing'
+LDFLAGS='-pie'
 %configure \
     --disable-perl --enable-gimp-remote \
 %if %{with python}
@@ -463,6 +471,20 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Tue Mar 17 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.5-5
+- require pygtk2 >= 2.10.4 (#490553)
+
+* Tue Mar 10 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.5-4
+- use correct fix from upstream to avoid crashes (#486122)
+- use -fno-strict-aliasing, PIC/PIE compilation flags
+
+* Mon Mar 09 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.5-3
+- rebuild against new WebKit
+- define deprecated gtk functions to avoid crashes (#486122)
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:2.6.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sun Feb 15 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.5-1
 - version 2.6.5
 
diff --git a/sources b/sources
index 209b524..215436c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 cd13050bc6bde6d8d8fd38eff6276033  gimp-2.6.5.tar.bz2
+9d661944b58b5ac675047b0ba2095ccc  gimp-2.6.5-gtk-version.patch.bz2