diff --git a/IO-Interactive-1.023.tar.gz b/IO-Interactive-1.023.tar.gz deleted file mode 100644 index 698ac4356fb1b20503af9802d1a7cee6bbd74f2d..0000000000000000000000000000000000000000 Binary files a/IO-Interactive-1.023.tar.gz and /dev/null differ diff --git a/IO-Interactive-1.025.tar.gz b/IO-Interactive-1.025.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..dee649c6024b7ff9ae84f3bf3515ca3f4753936e Binary files /dev/null and b/IO-Interactive-1.025.tar.gz differ diff --git a/license_clarification b/license_clarification new file mode 100644 index 0000000000000000000000000000000000000000..389fcd9851e9f3a27192884f4247a5d694cc40c8 --- /dev/null +++ b/license_clarification @@ -0,0 +1,86 @@ +From noreply@github.com Fri Jan 29 00:07:16 2016 +Return-Path: noreply@github.com +Received: from zmta01.collab.prod.int.phx2.redhat.com (LHLO + zmta01.collab.prod.int.phx2.redhat.com) (10.5.81.8) by + zmail14.collab.prod.int.phx2.redhat.com with LMTP; Thu, 28 Jan 2016 + 18:07:16 -0500 (EST) +Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) + by zmta01.collab.prod.int.phx2.redhat.com (Postfix) with ESMTP id 1D0D91858DC + for ; Thu, 28 Jan 2016 18:07:16 -0500 (EST) +Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) + by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0SN7GsH010697 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) + for ; Thu, 28 Jan 2016 18:07:16 -0500 +Received: from github-smtp2a-ext-cp1-prd.iad.github.net (github-smtp2-ext1.iad.github.net [192.30.252.192]) + by mx1.redhat.com (Postfix) with ESMTPS id 67E2B14AB3 + for ; Thu, 28 Jan 2016 23:07:15 +0000 (UTC) +Date: Thu, 28 Jan 2016 15:07:14 -0800 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=github.com; + s=pf2014; t=1454022434; + bh=e4MNImD1Xhn7YJZ6s8nOSxLu3LEA+y+Ebd2sNINLHtc=; + h=From:Reply-To:To:Cc:In-Reply-To:References:Subject:List-ID: + List-Archive:List-Post:List-Unsubscribe:From; + b=hkOAg1zHbp37kDqiP/puvNuoiGQ7cNi7ii09lfrWY5Br9C+LfNzq4CoElEDlO98Gl + JaBfE9mamyX7Qs1iPSsLOh7Fm8noDuhRw5DlzpzOlHW5l+q+mFddSIWU7ANNgGpURl + rzD9xwvhTFMxbDC/QZMeUaytl6Itd3NOYj6UwiQA= +From: brian d foy +Reply-To: briandfoy/io-interactive +To: briandfoy/io-interactive +Cc: Petr Pisar +Message-ID: +In-Reply-To: +References: +Subject: Re: [io-interactive] License mismatch in 1.021 (#2) +Mime-Version: 1.0 +Content-Type: multipart/alternative; + boundary="--==_mimepart_56aa9f22d5986_3e313fee8c2332b8148915bb"; + charset=UTF-8 +Content-Transfer-Encoding: 7bit +Precedence: list +X-GitHub-Sender: briandfoy +X-GitHub-Recipient: ppisar +X-GitHub-Reason: author +List-ID: briandfoy/io-interactive +List-Archive: https://github.com/briandfoy/io-interactive +List-Post: +List-Unsubscribe: , + +X-Auto-Response-Suppress: All +X-GitHub-Recipient-Address: ppisar@redhat.com +X-RedHat-Spam-Score: -1.569 (BAYES_50,DCC_CHECK,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HTML_IMAGE_ONLY_08,HTML_MESSAGE,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_PASS) 192.30.252.192 github-smtp2-ext1.iad.github.net 192.30.252.192 github-smtp2-ext1.iad.github.net +X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 +X-Scanned-By: MIMEDefang 2.75 on 10.5.110.26 +Status: RO +X-Status: A +Content-Length: 1259 +Lines: 28 + + +----==_mimepart_56aa9f22d5986_3e313fee8c2332b8148915bb +Content-Type: text/plain; + charset=UTF-8 +Content-Transfer-Encoding: 7bit + +As it says, Artistic 2.0. + +--- +Reply to this email directly or view it on GitHub: +https://github.com/briandfoy/io-interactive/issues/2#issuecomment-176474019 +----==_mimepart_56aa9f22d5986_3e313fee8c2332b8148915bb +Content-Type: text/html; + charset=UTF-8 +Content-Transfer-Encoding: 7bit + +

As it says, Artistic 2.0.

+ +

—
Reply to this email directly or view it on GitHub.

+
+
+ + +
+ +
+ +----==_mimepart_56aa9f22d5986_3e313fee8c2332b8148915bb-- + diff --git a/perl-IO-Interactive.spec b/perl-IO-Interactive.spec index 057d66f36458fa8b09ec17173986821f212aa158..a9aefe09afa4954fe11abeda0704d1c423cff777 100644 --- a/perl-IO-Interactive.spec +++ b/perl-IO-Interactive.spec @@ -1,73 +1,110 @@ -%global _empty_manifest_terminate_build 0 +# Perform optional tests +%bcond_without perl_IO_Interactive_enables_optional_test + Name: perl-IO-Interactive -Version: 1.023 +Version: 1.025 Release: 1 Summary: Utilities for interactive I/O -License: Artistic 2.0 -Group: Development/Libraries -URL: http://search.cpan.org/dist/IO-Interactive/ -Source0: http://www.cpan.org/authors/id/B/BD/BDFOY/IO-Interactive-%{version}.tar.gz +# lib/IO/Interactive.pm: GPL-1.0-or-later OR Artistic-1.0-Perl +# LICENSE: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND Artistic-2.0 +# license_clarification: Artistic-2.0 (brian d foy's explanation) +# README.pod: "see LICENSE file and the modules files" +# IO-Ineractive-1.021 added the ambiguous LICENSE file. Because there are +# still files only referring to Perl, but not referring to Artistic-2.0, +# I keep the (GPL-1.0-or-later OR Artistic-1.0-Perl) part in the License tag. +# +License: (GPL-1.0-or-later OR Artistic-1.0-Perl) AND Artistic-2.0 +URL: https://metacpan.org/release/IO-Interactive +Source0: https://cpan.metacpan.org/authors/id/B/BD/BDFOY/IO-Interactive-%{version}.tar.gz +Source1: license_clarification BuildArch: noarch -BuildRequires: perl >= 0:5.008 +BuildRequires: coreutils +BuildRequires: make BuildRequires: perl-generators -BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl-interpreter +BuildRequires: perl(:VERSION) >= 5.8 +BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76 +BuildRequires: perl(File::Spec) +BuildRequires: perl(File::Spec::Functions) +BuildRequires: perl(strict) +# Test::Manifest not used +BuildRequires: perl(warnings) +# Run-time: +BuildRequires: perl(Carp) +BuildRequires: perl(IO::Handle) +# Tests: BuildRequires: perl(Test::More) >= 1 +%if %{with perl_IO_Interactive_enables_optional_test} +# Optional tests: +BuildRequires: perl(Test::Pod) >= 1.14 +BuildRequires: perl(Test::Pod::Coverage) >= 1.04 +%endif +Requires: perl(Carp) + +# Filter underspecified dependencies +%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::More\\)$ + %description -This module provides three utility subroutines that make it easier to -develop interactive applications. -%package help -Summary : Utilities for interactive I/O -Provides: perl-IO-Interactive-doc -%description help -This module provides three utility subroutines that make it easier to -develop interactive applications. +This module provides utility subroutines that make it easier to develop +interactive applications. + +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness +Requires: perl(Test::More) >= 1 + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n IO-Interactive-%{version} +install -m 0644 %{SOURCE1} . +%if !%{with perl_IO_Interactive_enables_optional_test} +rm t/pod* +perl -i -ne 'print $_ unless m{^t/pod}' MANIFEST +%endif +chmod +x t/*.t + %build -export PERL_MM_OPT="" -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -export PERL_MM_OPT="" -rm -rf $RPM_BUILD_ROOT - -make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT - -find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; -find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; +%{make_install} +%{_fixperms} %{buildroot}/* +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +%if %{with perl_IO_Interactive_enables_optional_test} +rm %{buildroot}%{_libexecdir}/%{name}/t/pod* +%endif +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test -%{_fixperms} $RPM_BUILD_ROOT/* - -pushd %{buildroot} -touch filelist.lst -if [ -d usr/bin ];then - find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/sbin ];then - find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/lib64 ];then - find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst -fi -if [ -d usr/lib ];then - find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst -fi -popd -mv %{buildroot}/filelist.lst . -%check || : +%check +export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}') make test -%clean -rm -rf $RPM_BUILD_ROOT +%files +%license LICENSE +%doc Changes examples license_clarification README.pod +%dir %{perl_vendorlib}/IO +%{perl_vendorlib}/IO/Interactive.pm +%{_mandir}/man3/IO::Interactive.* -%files -f filelist.lst -%defattr(-,root,root,-) -%doc Changes INSTALL.SKIP LICENSE META.json -%{perl_vendorlib}/* -%files help -%{_mandir}/* +%files tests +%{_libexecdir}/%{name} %changelog +* Fri Apr 26 2024 Han Jinpeng - 1.025-1 +- 1. Upgrade to version 1.0.25 + 2. Add license_clarification file + 3. Add test subpackage + * Sun May 23 2021 Perl_Bot 1.023-1 - Specfile autogenerated by Perl_Bot