From d49c243d264f26ec57af396d0587ce520b196ffe Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul@city-fan.org>
Date: Fri, 13 Mar 2020 09:27:45 +0000
Subject: [PATCH] Remove non-free test file t/load-slides.t (#1813197, GH#219)

---
 .gitignore          |  1 +
 YAML-free           | 44 ++++++++++++++++++++++++++++++++++++++++++++
 perl-YAML.rpmlintrc |  6 ++++++
 perl-YAML.spec      | 12 ++++++++++--
 sources             |  2 +-
 5 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100755 YAML-free

diff --git a/.gitignore b/.gitignore
index 2bd9484..ad44a17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /YAML-[0-9.]*.tar.gz
+/YAML-free-[0-9.]*.tar.gz
diff --git a/YAML-free b/YAML-free
new file mode 100755
index 0000000..beae38a
--- /dev/null
+++ b/YAML-free
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# YAML-free: create repackaged YAML tarball without non-free content
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1813197
+#     https://github.com/ingydotnet/yaml-pm/issues/219
+#
+# Usage: YAML-free YAML-version.tar.gz
+# Creates: YAML-free-version.tar.gz
+
+case $# in
+1)	YAML_tarball="$1"
+	;;
+*)	echo "YAML-free: usage: YAML-free YAML-version.tar.gz" 1>&2
+	exit 1
+	;;
+esac
+
+if echo "$YAML_tarball" | grep --silent -x 'YAML-[1-9][0-9]*\.[0-9][0-9.]*\.tar\.gz'; then
+	YAML_free_tarball=$(echo "$YAML_tarball" | sed -e 's|^YAML|YAML-free|')
+	YAML_dirname=$(echo "$YAML_tarball" | sed -e 's|\.tar\.gz$||')
+else
+	echo "YAML-free: tarball $YAML_tarball does not meet expected naming" 1>&2
+	exit 1
+fi
+
+echo "Creating $YAML_free_tarball from $YAML_tarball in directory $YAML_dirname"
+
+echo "Ensuring directory $YAML_dirname does not already exist"
+rm -rf "$YAML_dirname"
+
+echo "Extracting $YAML_tarball"
+tar xfz "$YAML_tarball"
+
+echo "Removing non-free file t/load-slides.t"
+rm "$YAML_dirname/t/load-slides.t"
+
+echo "Removing reference to non-free file t/load-slides.t from MANIFEST"
+sed -i -e '/^t\/load-slides.t/d' "$YAML_dirname/MANIFEST"
+
+echo "Creating $YAML_free_tarball"
+tar cfz "$YAML_free_tarball" "$YAML_dirname"
+
+echo "Removing work directory $YAML_dirname"
+rm -rf "$YAML_dirname"
diff --git a/perl-YAML.rpmlintrc b/perl-YAML.rpmlintrc
index f2d9e78..89adb01 100644
--- a/perl-YAML.rpmlintrc
+++ b/perl-YAML.rpmlintrc
@@ -1,2 +1,8 @@
 from Config import *
 addFilter("spelling-error Summary\(en_US\) tm -> ")
+
+# Tarball modified to remove non-free content
+addFilter("invalid-url Source0: YAML-free-[0-9.]*\.tar\.gz")
+
+# Tarball creation script is of course executable
+addFilter("strange-permission YAML-free 755")
diff --git a/perl-YAML.spec b/perl-YAML.spec
index 07b088c..2534fe2 100644
--- a/perl-YAML.spec
+++ b/perl-YAML.spec
@@ -13,11 +13,16 @@
 
 Name:           perl-YAML
 Version:        1.30
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        YAML Ain't Markup Language (tm)
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/YAML
-Source0:        https://cpan.metacpan.org/modules/by-module/YAML/YAML-%{version}.tar.gz
+# Tarball created from https://cpan.metacpan.org/modules/by-module/YAML/YAML-%%{version}.tar.gz
+# using script YAML-free (see https://bugzilla.redhat.com/show_bug.cgi?id=1813197)
+Source0:        YAML-free-%{version}.tar.gz
+# Script to remove non-free content from upstream tarball
+# Usage: YAML-free YAML-%%{version}.tar.gz
+Source1:        YAML-free
 BuildArch:      noarch
 # Module Build
 BuildRequires:  coreutils
@@ -129,6 +134,9 @@ make test AUTHOR_TESTING=%{with perl_YAML_enables_extra_test}
 %{_mandir}/man3/YAML::Types.3*
 
 %changelog
+* Fri Mar 13 2020 Paul Howarth <paul@city-fan.org> - 1.30-2
+- Remove non-free test file t/load-slides.t (#1813197, GH#219)
+
 * Tue Jan 28 2020 Paul Howarth <paul@city-fan.org> - 1.30-1
 - Update to 1.30
   - Breaking Change: Set $YAML::LoadBlessed default to false to make it more
diff --git a/sources b/sources
index 57b5138..3c6b326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (YAML-1.30.tar.gz) = f73f2d9f3cd96edeb05ec098c859755dd6b80bf1a00049f8de2889ebbf4f41df9fcc1540116afa8648e965a0b780d993f256af2c5ffc03a9f1ba7df1f0cc8941
+SHA512 (YAML-free-1.30.tar.gz) = 7ac72b2e688d14e0e6280d6cfcfece553b052bf2daeeb9ce09fd501151d27c7eedefd1ec9f7c1e587aaa6822c3b4fb0227a3b162d7fcaae8c2fcf616200d750e