[gimp] patch rebuilt files after changing configure.ac

Nils Philippsen nphilipp at fedoraproject.org
Tue Jun 4 09:33:30 UTC 2013


commit 750dc666f116cffa8be2ee0143cc42e1d1093639
Author: Nils Philippsen <nils at redhat.com>
Date:   Tue Jun 4 11:27:53 2013 +0200

    patch rebuilt files after changing configure.ac
    
    This avoids rebuilding them during build time which would make this
    non-deterministic, and fails in some cases, depending on which build
    dependencies get pulled in (e.g. on Fedora 17).

 .gitignore |    1 +
 gimp.spec  |   11 ++++++++++-
 sources    |    1 +
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c3dcb59..528bf8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
 /gimp-2.8.0.tar.bz2
 /gimp-2.8.2.tar.bz2
 /gimp-2.8.4.tar.bz2
+/gimp-2.8.4-5-autofoo.patch.bz2
diff --git a/gimp.spec b/gimp.spec
index c1417a1..7e181ab 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -82,7 +82,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.8.4
-Release:        %{?prerelprefix}4%{dotprerel}%{dotgitrev}%{?dist}
+Release:        %{?prerelprefix}5%{dotprerel}%{dotgitrev}%{?dist}
 
 # Compute some version related macros
 # Ugly hack, you need to get your quoting backslashes/percent signs straight
@@ -226,6 +226,8 @@ Patch7:         gimp-2.8.4-text-selection-crash.patch
 # Don't crash upon not applying a color profile to a grayscale image.
 # Upstream commit 15b88af4f11e556a1c30cd5bc447bb0c7c24d3c6
 Patch8:         gimp-2.8.4-color-profile-crash.patch
+# Rebuilt files after changing configure.ac above.
+Patch100:       gimp-2.8.4-5-autofoo.patch.bz2
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -321,6 +323,10 @@ EOF
 %patch7 -p1 -b .text-selection-crash
 %patch8 -p1 -b .color-profile-crash
 
+%patch100 -p1 -b .autofoo
+# avoid running autoheader
+touch config.h.in
+
 %build
 %if %{with hardening}
 # Use hardening compiler/linker flags because gimp is likely to deal with files
@@ -624,6 +630,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Tue Jun 04 2013 Nils Philippsen <nils at redhat.com> - 2:2.8.4-5
+- patch rebuilt files after changing configure.ac
+
 * Wed May 29 2013 Nils Philippsen <nils at redhat.com> - 2:2.8.4-4
 - fix upstream commit ids
 - fix double-free crashes when selecting gradients from script-fu (#964470)
diff --git a/sources b/sources
index 73d3314..dcabf1d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 392592e8755d046317878d226145900f  gimp-2.8.4.tar.bz2
+213e4e0e2e99123f467c305ae8948a71  gimp-2.8.4-5-autofoo.patch.bz2


More information about the scm-commits mailing list