From e11a8410585673efb88655949dd0b6c10605741e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mar 08 2018 04:54:19 +0000
Subject: Rebuild to fix GCC 8 mis-compilation, clean tarball


See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")

---

diff --git a/.gitignore b/.gitignore
index 0d4f24d..230c39e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ vigra-1.7.0-src.tar.gz
 /vigra-1.10.0-src-clean.tar.gz
 /vigra-1.11.0-src-clean.tar.gz
 /vigra-1.11.1-src.tar.gz
+/vigra-1.11.1-src-clean.tar.gz
diff --git a/sources b/sources
index 35ef2de..1cc37a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vigra-1.11.1-src.tar.gz) = 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
+SHA512 (vigra-1.11.1-src-clean.tar.gz) = 38c500dacf7a8b8bba22bd3aabaacd061589f76331f9ccf17c52096fa82ff510e531f2120326970789e0f22c4584c35fcb7bfc0eaffce80bea28e2f545a0e12f
 SHA512 (vigra-config.sh) = 03201ad578ff332cb1186bfa9d4871ada509a8322fb07bd38f00e9254b8c7766920621bb617fdebd927714539fe1ca2a56e7a1a8ce91f02bc2e92d3572d47cb9
diff --git a/vigra.spec b/vigra.spec
index 1ff5095..3e44b5c 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -6,14 +6,15 @@
 Summary:        Generic Programming for Computer Vision
 Name:           vigra
 Version:        1.11.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        MIT
 Group:          Development/Libraries
 # The "Lenna" files are non-free, we need to remove them from the source tarball.
-# tar xf vigra-1.11.0-src.tar.gz
-# find vigra-1.11.0/ -name "lenna*" -delete
-# tar zcf vigra-1.11.0-src-clean.tar.gz vigra-1.11.0/
-Source0:        https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
+# wget https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-1.11.1-src.tar.gz
+# tar xf vigra-1.11.1-src.tar.gz
+# find vigra-1.11.1/ -name "lenna*" -delete
+# tar zcf vigra-1.11.1-src-clean.tar.gz vigra-1.11.1/
+Source0:        %{name}-%{version}-src-clean.tar.gz
 Source1:        vigra-config.sh
 URL:            http://ukoethe.github.io/vigra/
 BuildRequires:  gcc-c++ zlib-devel libjpeg-devel libpng-devel libtiff-devel fftw-devel >= 3
@@ -167,6 +168,11 @@ install -p -m755 -D %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/vigra-config
 %endif
 
 %changelog
+* Wed Mar 07 2018 Adam Williamson <awilliam@redhat.com> - 1.11.1-6
+- Rebuild to fix GCC 8 mis-compilation
+  See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64")
+- Clean tarball of non-free image files (bump to 1.11.1 omitted this)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild