From 0115ae95292d71971bf8872bfa3ff0b43fe27e85 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Mon, 10 Jul 2006 09:55:29 +0000
Subject: [PATCH] version 2.2.12 use %dist/%fedora/%redhat remove gcc4 patch as
 upstream has     different solution

---
 .cvsignore |  2 +-
 gimp.spec  | 47 ++++++++++++++++++++++++++++++++++-------------
 sources    |  2 +-
 3 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8513ec5..76e5082 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gimp-2.2.11.tar.bz2
+gimp-2.2.12.tar.bz2
diff --git a/gimp.spec b/gimp.spec
index c1aa7ff..dfde377 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,17 +1,35 @@
-%define _enable_modularX %{?enable_modularX:%{enable_modularX}}%{?!enable_modularX:1}
-%define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1}
-%define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1}
-%define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1}
-%define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0}
-%define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1}
-%define _with_lcms %{?with_lcms:%{with_lcms}}%{?!with_lcms:1}
+#### options:
+# Use the following --with/--without <option> switches to control how the
+# package will be built:
+# 
+# modular_x:   modular X deps
+# lcms:        lcms support
+# python:      python support
+# mp:          multi processor support
+# static:      build static libraries
+# print:       build the print plugin (if you don't build it externally)
+# convenience: install convenience symlinks
+
+%if 0%{?fedora} >= 5 || 0%{?redhat} >= 5
+%define _enable_modularX 0%{!?_without_modular_x:1}
+%define _enable_lcms 0%{!?_without_lcms:1}
+%else
+%define _enable_modularX 0%{?_with_modular_x:1}
+%define _enable_lcms 0%{?_with_lcms:1}
+%endif
+
+%define _enable_python 0%{!?_without_python:1}
+%define _enable_mp 0%{!?_without_mp:1}
+%define _enable_static 0%{!?_without_static:1}
+%define _enable_print 0%{?_with_print:1}
+%define _enable_convenience %{!?_without_convenience:1}
 
 #
 #
 
 Summary:	The GNU Image Manipulation Program
 Name: 		gimp
-Version: 	2.2.11
+Version: 	2.2.12
 %define binver 2.2
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -19,7 +37,7 @@ Version: 	2.2.11
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
 #define prever pre2
-Release: %{?prever:0.0.%{prever}.}5
+Release: %{?prever:0.0.%{prever}.}5%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -58,7 +76,7 @@ BuildRequires:	perl
 BuildRequires:	libwmf-devel >= 0.2.8
 BuildRequires:  intltool
 BuildRequires:  findutils
-%if %_with_lcms
+%if %_enable_lcms
 BuildRequires:	lcms-devel
 %endif
 Requires:	desktop-file-utils >= 0.9
@@ -77,7 +95,6 @@ Source0: 	ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{versi
 Patch0:		gimp-2.0pre3-buildroot.patch
 Patch1:		gimp-2.0.1-gimphelpmissing.patch
 Patch2:		gimp-2.2.3-icontheme.patch
-Patch3:		gimp-2.2.7-gcc4.patch
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
@@ -111,7 +128,6 @@ extensions.
 %patch0 -p1 -b .buildroot
 %patch1 -p1 -b .gimphelpmissing
 %patch2 -p1 -b .icontheme
-%patch3 -p1 -b .gcc4
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
@@ -151,7 +167,7 @@ CFLAGS="%optflags -fomit-frame-pointer" \
 %else
 	--disable-print \
 %endif
-%if %_with_lcms
+%if %_enable_lcms
 	--with-lcms \
 %else
 	--without-lcms \
@@ -363,6 +379,11 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Jul 07 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.12-1
+- version 2.2.12
+- use %%dist/%%fedora/%%redhat
+- remove gcc4 patch as upstream has different solution
+
 * Wed May 31 2006 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.11-5
 - cope with pygobject2/-devel being split off (#193368)
 
diff --git a/sources b/sources
index 6c37d70..6657c02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0403e9b4e0415c99cd27b137b9839212  gimp-2.2.11.tar.bz2
+6a1906db60166a88317f2df5f195a57d  gimp-2.2.12.tar.bz2