diff --git a/gtatool-2.2.0-imagemagick-7.patch b/gtatool-2.2.0-imagemagick-7.patch deleted file mode 100644 index 2c31e6f..0000000 --- a/gtatool-2.2.0-imagemagick-7.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/tests/Makefile.am 2016-01-26 07:07:55.497379476 -0600 -+++ b/tests/Makefile.am 2017-08-25 10:29:51.689894629 -0500 -@@ -102,7 +102,7 @@ - TESTS += gta-component-compute.sh - endif - if WITH_QT --TESTS += gta-gui.sh -+#TESTS += gta-gui.sh - endif - - if WITH_CSV -@@ -136,7 +136,7 @@ - TESTS += conv-netcdf.sh - endif - if WITH_NETPBM --TESTS += conv-netpbm.sh -+#TESTS += conv-netpbm.sh - endif - if WITH_PCD - TESTS += conv-pcd.sh ---- a/configure.ac 2016-01-26 07:07:55.489379500 -0600 -+++ b/configure.ac 2017-08-25 10:33:59.212960812 -0500 -@@ -354,7 +354,7 @@ - AC_MSG_WARN([$libmagick_PKG_ERRORS]) - AC_MSG_WARN([Disabled the from-magick and to-magick commands.])]) - else -- PKG_CHECK_MODULES([libmagick], [ImageMagick++ >= 0.0], [], -+ PKG_CHECK_MODULES([libmagick], [Magick++ >= 0.0], [], - [magick="no " - AC_MSG_WARN([ImageMagick++ library not found:]) - AC_MSG_WARN([$libmagick_PKG_ERRORS]) ---- a/src/conv-magick/from-magick.cpp 2014-09-20 13:16:58.484142786 -0500 -+++ b/src/conv-magick/from-magick.cpp 2017-08-25 10:36:47.109034804 -0500 -@@ -102,7 +102,7 @@ - bool is_graylevel = false; - if (format.value().empty()) - { -- has_alpha = imgs[i].matte(); -+ has_alpha = imgs[i].alpha(); - is_graylevel = (imgs[i].colorSpace() == Magick::GRAYColorspace); - } - else if (format.value().compare("l") == 0) diff --git a/gtatool.spec b/gtatool.spec index bdcb109..32dd6f5 100644 --- a/gtatool.spec +++ b/gtatool.spec @@ -2,14 +2,13 @@ Name: gtatool Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Commandline tool to manipulate GTAs Group: Applications/Engineering License: GPLv3+ URL: http://gta.nongnu.org/gtatool.html Source0: http://download.savannah.nongnu.org/releases/gta/%{name}-%{version}.tar.xz Patch0: %{name}-2.2.0-pcl18.patch -Patch1: %{name}-2.2.0-imagemagick-7.patch BuildRequires: gettext-devel BuildRequires: bash-completion @@ -146,7 +145,6 @@ sound data via libsndfile. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build @@ -267,6 +265,9 @@ fi %changelog +* Tue Sep 05 2017 Adam Williamson - 2.2.0-9 +- Rebuild for ImageMagick 6 reversion, drop ImageMagick 7 patch + * Fri Aug 25 2017 Michael Cronenworth - 2.2.0-8 - Rebuild for new ImageMagick