From 657eda788dd9da7c02491dce2e0f7713b6d9611e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Oct 09 2015 11:00:29 +0000 Subject: Add devscripts_ipc-run.patch to remove dpkg-perl dependency on licensecheck --- diff --git a/devscripts.spec b/devscripts.spec index 2fa4729..680c6a6 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -1,6 +1,6 @@ Name: devscripts Version: 2.15.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scripts for Debian Package maintainers License: GPLv2+ @@ -12,6 +12,8 @@ Patch0: devscripts_docbook.patch Patch1: devscripts_install-layout.patch # Install some additional man pages Patch2: devscripts_install-man.patch +# Use IPC::Run::run instead of Dpkg::IPC::spawn +Patch3: devscripts_ipc-run.patch # rpmdevtools < 8.4 bundled some of the scripts provided by this package Conflicts: rpmdevtools < 8.4 @@ -30,7 +32,6 @@ BuildRequires: perl(Dpkg::Changelog::Parse) BuildRequires: perl(Dpkg::Compression) BuildRequires: perl(Dpkg::Control) BuildRequires: perl(Dpkg::Control::Hash) -BuildRequires: perl(Dpkg::IPC) BuildRequires: perl(Dpkg::Vendor) BuildRequires: perl(Dpkg::Version) BuildRequires: perl(Encode) @@ -51,6 +52,7 @@ BuildRequires: perl(Getopt::Long) BuildRequires: perl(IO::Dir) BuildRequires: perl(IO::File) BuildRequires: perl(IO::Handle) +BuildRequires: perl(IPC::Run) BuildRequires: perl(List::Util) BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(Net::SMTP) @@ -108,6 +110,7 @@ This package contains the following subset of the devscripts scripts: %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -160,6 +163,9 @@ ln -s %{_mandir}/man1/pts-subscribe.1.gz %{buildroot}%{_mandir}/man1/pts-unsubsc %changelog +* Fri Oct 09 2015 Sandro Mani - 2.15.9-2 +- Add devscripts_ipc-run.patch to remove dpkg-perl dependency on licensecheck + * Tue Oct 06 2015 Sandro Mani - 2.15.9-1 - Update to 2.15.9 diff --git a/devscripts_ipc-run.patch b/devscripts_ipc-run.patch new file mode 100644 index 0000000..ae1ee12 --- /dev/null +++ b/devscripts_ipc-run.patch @@ -0,0 +1,25 @@ +diff -rupN devscripts-2.15.9/scripts/licensecheck.pl devscripts-2.15.9-new/scripts/licensecheck.pl +--- devscripts-2.15.9/scripts/licensecheck.pl 2015-10-06 03:00:34.000000000 +0200 ++++ devscripts-2.15.9-new/scripts/licensecheck.pl 2015-10-09 12:51:12.425215534 +0200 +@@ -157,7 +157,7 @@ use warnings; + use warnings qw< FATAL utf8 >; + use Encode qw/decode/; + +-use Dpkg::IPC qw(spawn); ++use IPC::Run qw(run); + use Getopt::Long qw(:config gnu_getopt); + use File::Basename; + +@@ -337,11 +337,7 @@ while (@files) { + + # Encode::Guess does not work well, use good old file command to get file encoding + my $mime; +- spawn(exec => ['file', '--brief', '--mime', '--dereference', '--', $file], +- to_string => \$mime, +- error_to_file => '/dev/null', +- nocheck => 1, +- wait_child => 1); ++ run [qw(file --brief --mime --dereference), $file], \undef, \$mime; + my $charset ; + if ($mime =~ m/; charset=((?!binary)(?!unknown)[\w-]+)/) { + $charset = $1;