From ada328dc275a2c6b28b9d456c92b1a1be2fe4922 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Sat, 22 Apr 2017 09:10:05 +0100
Subject: [PATCH] Update to 2.60

- New upstream release 2.60
  - Add missing methods newFromWBMP, newFromXbm (CPAN RT #68784) and some
    missing docs
  - Add --lib_fontconfig_path, --fcgi options
  - Rewrote most of the XS code
  - Clean up Makefile.PL (GH#20)
---
 GD-2.59-cflags.patch | 10 ----------
 GD-2.60-cflags.patch | 11 +++++++++++
 perl-GD.spec         | 13 +++++++++++--
 sources              |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)
 delete mode 100644 GD-2.59-cflags.patch
 create mode 100644 GD-2.60-cflags.patch

diff --git a/GD-2.59-cflags.patch b/GD-2.59-cflags.patch
deleted file mode 100644
index 15c1960..0000000
--- a/GD-2.59-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.PL
-+++ Makefile.PL
-@@ -237,7 +237,6 @@ print F $DEFINES,"\n";
- close F;
- 
- my $CCFLAGS = $Config{ccflags};
--$CCFLAGS .= " -Wformat=0" if $Config{gccversion};
- 
- WriteMakefile(
-     'NAME'	=> 'GD',
diff --git a/GD-2.60-cflags.patch b/GD-2.60-cflags.patch
new file mode 100644
index 0000000..2bd07b1
--- /dev/null
+++ b/GD-2.60-cflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.PL
++++ Makefile.PL
+@@ -248,7 +248,7 @@ print F $DEFINES,"\n";
+ close F;
+ 
+ my $CCFLAGS = $Config{ccflags};
+-$CCFLAGS .= " -Wall -Wextra -Wformat=0" if $Config{gccversion} and $] > 5.020;
++$CCFLAGS .= " -Wall -Wextra" if $Config{gccversion} and $] > 5.020;
+ 
+ WriteMakefile(
+     'NAME'	=> 'GD',
diff --git a/perl-GD.spec b/perl-GD.spec
index 5d82d63..bfc8c14 100644
--- a/perl-GD.spec
+++ b/perl-GD.spec
@@ -1,12 +1,12 @@
 Name:           perl-GD
-Version:        2.59
+Version:        2.60
 Release:        1%{?dist}
 Summary:        Perl interface to the GD graphics library
 License:        GPL+ or Artistic 2.0
 URL:            http://search.cpan.org/dist/GD/
 Source0:        http://www.cpan.org/authors/id/R/RU/RURBAN/GD-%{version}.tar.gz
 Patch0:         GD-2.56-utf8.patch
-Patch1:         GD-2.59-cflags.patch
+Patch1:         GD-2.60-cflags.patch
 # Module Build
 BuildRequires:  coreutils
 BuildRequires:  findutils
@@ -28,6 +28,7 @@ BuildRequires:  perl(Exporter)
 BuildRequires:  perl(FileHandle)
 BuildRequires:  perl(Math::Trig)
 BuildRequires:  perl(strict)
+BuildRequires:  perl(Symbol)
 BuildRequires:  perl(vars)
 # Test Suite
 BuildRequires:  perl(constant)
@@ -90,6 +91,14 @@ make test TEST_VERBOSE=1
 %{_mandir}/man3/GD::Simple.3*
 
 %changelog
+* Sat Apr 22 2017 Paul Howarth <paul@city-fan.org> - 2.60-1
+- Update to 2.60
+  - Add missing methods newFromWBMP, newFromXbm (CPAN RT #68784) and some
+    missing docs
+  - Add --lib_fontconfig_path, --fcgi options
+  - Rewrote most of the XS code
+  - Clean up Makefile.PL (GH#20)
+
 * Fri Apr 21 2017 Paul Howarth <paul@city-fan.org> - 2.59-1
 - Update to 2.59
   - Remove Build.PL, fix permissions, fix for missing gdlib-config
diff --git a/sources b/sources
index b474b8d..060daa0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (GD-2.59.tar.gz) = 7accaabbffbba70a0030656b67dd2f8f6ee84ac616a5ca6b877bc7d69f4896319ac535726c5a147303e14bcfb6c107f9be2753f744a438cdd20bfab6b2b87330
+SHA512 (GD-2.60.tar.gz) = 19decda8663c4e9e56fc0ab36348ba6b2f8f7bf28ff061e6c8568526db0d5945218e3c3f7effdce6e615f98067092f7b598156c932ea4887d3c173e5c722a397