[rpms/perl-GDGraph] epel9: Update to 1.55

[rpms/perl-GDGraph] epel9: Update to 1.55

[Paul Howarth]

            A new commit has been pushed.

            Repo   : rpms/perl-GDGraph
            Branch : epel9
            Commit : ae123b8adafcec83f4e6f43b1ba8429abb85fd1c
            Author : Paul Howarth <paul@city-fan.org>
            Date   : 2023-01-13T09:16:04+00:00
            Stats  : +16/-62 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/perl-GDGraph/c/ae123b8adafcec83f4e6f43b1ba8429abb85fd1c?branch=epel9

            Log:
            Update to 1.55

- New upstream release 1.55
  - Fix failing XBM test resulting from some upstream changes (CPAN RT#140940)
  - Skip samples tests if libgd has image support disabled, which is the
    default starting with version 2.3.3
    (see https://github.com/libgd/libgd/issues/428)
- Use SPDX-format license tag
- Drop perl(:MODULE_COMPAT_XXX) dependency
  (https://fedoraproject.org/wiki/Changes/Perl_replace_MODULE_COMPAT_by_generator)

---
diff --git a/.gitignore b/.gitignore
index 3f8ff72..c5765a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /GDGraph-1.52.tar.gz
 /GDGraph-1.53.tar.gz
 /GDGraph-1.54.tar.gz
+/GDGraph-1.55.tar.gz

diff --git a/GDGraph-1.54-XBM-Magic.patch b/GDGraph-1.54-XBM-Magic.patch
deleted file mode 100644
index 542514c..0000000
--- a/GDGraph-1.54-XBM-Magic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 96862391296b235c60e0e36140f8ea498f70a74d Mon Sep 17 00:00:00 2001
-From: Reini Urban <rurban@cpan.org>
-Date: Tue, 1 Feb 2022 15:10:53 +0100
-Subject: [PATCH] fix logo_xbm_noext test
-
-causing t/bugfixes.t to fail with latest GD
-provide xbm magic, which has no newFromXbmData method.
----
- Graph.pm        | 6 +++++-
- t/images/main.c | 8 ++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
- create mode 100644 t/images/main.c
-
-diff --git a/Graph.pm b/Graph.pm
-index 816c99a..f12d588 100644
---- a/Graph.pm
-+++ b/Graph.pm
-@@ -347,7 +347,8 @@ sub _read_logo_file
-             pack("H8",'ffd8ffe0') => "jpeg",
-             'GIF8' => "gif",
-             '.PNG' => "png",
--            '/* X'=> "xpm", # technically '/* XPM */', but I'm hashing, here
-+            '/* X' => "xpm", # technically '/* XPM */', but I'm hashing, here
-+            '#def' => "xbm",
-         );
-         if (my $match = $magic{ substr $logodata, 0, 4 }) {
-             push @tried, $match;
-@@ -362,6 +363,9 @@ sub _read_logo_file
-                     $glogo = GD::Image->$gdimport(\*LOGO);
-                 }
-             }
-+        } elsif ($logo_path =~ /_xbm_/) { # no magic possible for xbm
-+            push @tried, 'xbm';
-+            $glogo = GD::Image->newFromXbm($logo_path);
-         # should this actually be "if (!$glogo), rather than an else?            
-         } else { # Hail Mary, full of Grace!  Blessed art thou among women...
-             push @tried, 'libgd best-guess';
-diff --git a/t/images/main.c b/t/images/main.c
-new file mode 100644
-index 0000000..6d64b11
---- /dev/null
-+++ b/t/images/main.c
-@@ -0,0 +1,8 @@
-+#include <stdio.h>
-+#include "logo_xbm_noext.c"
-+
-+void main() {
-+  FILE *f = fopen ("logo_xbm_noext", "w");
-+  fwrite (logo_bits, sizeof(logo_bits), 1, f);
-+  fclose (f);
-+}

diff --git a/perl-GDGraph.spec b/perl-GDGraph.spec
index 45e028c..b81d59e 100644
--- a/perl-GDGraph.spec
+++ b/perl-GDGraph.spec
@@ -1,12 +1,11 @@
 Name:           perl-GDGraph
 Epoch:          1
-Version:        1.54
-Release:        21%{?dist}
+Version:        1.55
+Release:        1%{?dist}
 Summary:        Graph generation package for Perl
-License:        (GPL+ or Artistic) and GPLv2+
+License:        (GPL-1.0-or-later OR Artistic-1.0-Perl) AND GPL-2.0-or-later
 URL:            https://metacpan.org/release/GDGraph
 Source0:        https://cpan.metacpan.org/modules/by-module/GD/GDGraph-%{version}.tar.gz
-Patch0:         GDGraph-1.54-XBM-Magic.patch
 BuildArch:      noarch
 # Build
 BuildRequires:  coreutils
@@ -36,7 +35,6 @@ BuildRequires:  perl(Test::Exception)
 BuildRequires:  perl(Test::More) >= 0.88
 BuildRequires:  perl(warnings)
 # Dependencies
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Data::Dumper)
 Requires:       perl(GD) >= 1.18
 Requires:       perl(GD::Text) >= 0.80
@@ -51,10 +49,6 @@ Requires:       perl(Text::ParseWords)
 %prep
 %setup -q -n GDGraph-%{version}
 
-# Fix logo_xbm_noext test
-# https://github.com/mgjv/GDGraph/pull/1
-%patch0 -p1
-
 # Fix shellbangs
 perl -pi -e 's{^#!/usr/local/bin/perl\b}{#!%{__perl}}' \
   samples/sample1A.pl \
@@ -75,7 +69,7 @@ perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
 make test
 
 %files
-# Dustismo_Sans.ttf is GPLv2+, everything else is GPL+ or Artistic
+# Dustismo_Sans.ttf is GPL-2.0-or-later, everything else is GPL-1.0-or-later OR Artistic-1.0-Perl
 %license Dustismo.LICENSE
 %doc CHANGES README Dustismo_Sans.ttf samples/
 %{perl_vendorlib}/GD/
@@ -87,6 +81,16 @@ make test
 %{_mandir}/man3/GD::Graph::hbars.3*
 
 %changelog
+* Fri Jan 13 2023 Paul Howarth <paul@city-fan.org> - 1:1.55-1
+- Update to 1.55
+  - Fix failing XBM test resulting from some upstream changes (CPAN RT#140940)
+  - Skip samples tests if libgd has image support disabled, which is the
+    default starting with version 2.3.3
+    (see https://github.com/libgd/libgd/issues/428)
+- Use SPDX-format license tag
+- Drop perl(:MODULE_COMPAT_XXX) dependency
+  (https://fedoraproject.org/wiki/Changes/Perl_replace_MODULE_COMPAT_by_generator)
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.54-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

diff --git a/sources b/sources
index 009279b..0e70f3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38c6a188519e6272e9b2b722b315c3d8  GDGraph-1.54.tar.gz
+SHA512 (GDGraph-1.55.tar.gz) = dfe3b9789d921c5b84ed8c9f363f00ae8f0a4ad093ea2236fc23defa8adc367da00fa235f1089e18c7791c33fd3ab0c32f6f9ba0fdf1ca1c1897b25e9243f356