Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

2 changed files with 101 additions and 13 deletions

View File

@ -0,0 +1,44 @@
From 83987c6c69aa34a60eeb0dda95dd40cf6cbcb24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 29 Jul 2019 09:13:05 +0200
Subject: [PATCH] Do not test PDF file for new-lines
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
A PDF file can contain a stream object that contains "\r\n"byte
sequence. Therefore it does not make sense to test the PDF file for
new-lines.
CPAN RT#130221
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
t/05_cleanpdf.t | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/05_cleanpdf.t b/t/05_cleanpdf.t
index bb8f863..59b8ab7 100644
--- a/t/05_cleanpdf.t
+++ b/t/05_cleanpdf.t
@@ -14,7 +14,7 @@ unless ( -e 'have_make' ) {
eval { require App::pod2pdf; };
plan skip_all => 'App::pod2pdf not installed' if $@;
-plan tests => 13;
+plan tests => 12;
{
my $make = $Config{make};
@@ -70,7 +70,7 @@ ok( -e 'Foobar.man', 'There is a Foobar.man file' );
ok( -e 'Foobar.pdf', 'There is a Foobar.pdf file' );
unlike io->file($_)->all, qr/\r\n/, "$_ contains only unix newlines"
- for qw( Foobar.txt Foobar.htm Foobar.man Foobar.pdf );
+ for qw( Foobar.txt Foobar.htm Foobar.man );
my $distclean = capture_merged { system "$make distclean" };
diag("$distclean");
--
2.20.1

View File

@ -1,26 +1,29 @@
# Support output to PDF
%if ! (0%{?rhel}) %if ! (0%{?rhel})
# Perform optional tests
%{bcond_without perl_Module_Install_ReadmeFromPod_enables_optional_test}
# Support output to PDF
%{bcond_without perl_Module_Install_ReadmeFromPod_enables_pdf} %{bcond_without perl_Module_Install_ReadmeFromPod_enables_pdf}
%else %else
%{bcond_with perl_Module_Install_ReadmeFromPod_enables_optional_test}
%{bcond_with perl_Module_Install_ReadmeFromPod_enables_pdf} %{bcond_with perl_Module_Install_ReadmeFromPod_enables_pdf}
%endif %endif
Name: perl-Module-Install-ReadmeFromPod Name: perl-Module-Install-ReadmeFromPod
Version: 0.30 Version: 0.30
Release: 4%{?dist} Release: 17%{?dist}
Summary: Module::Install extension to automatically convert POD to a README Summary: Module::Install extension to automatically convert POD to a README
License: GPL+ or Artistic License: GPL+ or Artistic
Group: Development/Libraries URL: https://metacpan.org/release/Module-Install-ReadmeFromPod
URL: http://search.cpan.org/dist/Module-Install-ReadmeFromPod/ Source0: https://cpan.metacpan.org/authors/id/B/BI/BINGOS/Module-Install-ReadmeFromPod-%{version}.tar.gz
Source0: http://www.cpan.org/authors/id/B/BI/BINGOS/Module-Install-ReadmeFromPod-%{version}.tar.gz
# Regenerate README in UTF-8 # Regenerate README in UTF-8
Patch0: Module-Install-ReadmeFromPod-0.26-Regenerate-README-in-UTF-8.patch Patch0: Module-Install-ReadmeFromPod-0.26-Regenerate-README-in-UTF-8.patch
# Remove a bogus test that fails on PDF binary files randomly, CPAN RT#130221
Patch1: Module-Install-ReadmeFromPod-0.30-Do-not-test-PDF-file-for-new-lines.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: coreutils BuildRequires: coreutils
BuildRequires: findutils
BuildRequires: make BuildRequires: make
BuildRequires: perl-interpreter
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: perl-interpreter
BuildRequires: perl(Config) BuildRequires: perl(Config)
BuildRequires: perl(inc::Module::Install) BuildRequires: perl(inc::Module::Install)
BuildRequires: perl(lib) BuildRequires: perl(lib)
@ -29,7 +32,6 @@ BuildRequires: perl(Module::Install::AuthorRequires) >= 0.02
BuildRequires: perl(Module::Install::GithubMeta) BuildRequires: perl(Module::Install::GithubMeta)
BuildRequires: perl(Module::Install::Metadata) BuildRequires: perl(Module::Install::Metadata)
BuildRequires: perl(strict) BuildRequires: perl(strict)
BuildRequires: sed
# Build script uses lib/Module/Install/ReadmeFromPod.pm # Build script uses lib/Module/Install/ReadmeFromPod.pm
# Run-time: # Run-time:
BuildRequires: perl(base) BuildRequires: perl(base)
@ -52,9 +54,11 @@ BuildRequires: perl(File::Path)
BuildRequires: perl(File::Temp) BuildRequires: perl(File::Temp)
BuildRequires: perl(Test::InDistDir) BuildRequires: perl(Test::InDistDir)
BuildRequires: perl(Test::More) >= 0.47 BuildRequires: perl(Test::More) >= 0.47
%if %{with perl_Module_Install_ReadmeFromPod_enables_optional_test}
# Optional tests: # Optional tests:
BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(Test::Pod) >= 1.00
BuildRequires: perl(Test::Pod::Coverage) >= 1.00 BuildRequires: perl(Test::Pod::Coverage) >= 1.00
%endif
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%if %{with perl_Module_Install_ReadmeFromPod_enables_pdf} %if %{with perl_Module_Install_ReadmeFromPod_enables_pdf}
Suggests: perl(App::pod2pdf) Suggests: perl(App::pod2pdf)
@ -80,19 +84,19 @@ supported: plain-text, HTML, PDF or manual page.
%prep %prep
%setup -q -n Module-Install-ReadmeFromPod-%{version} %setup -q -n Module-Install-ReadmeFromPod-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
# Remove bundled modules # Remove bundled modules
rm -r inc rm -r inc
sed -i -e '/^inc\// d' MANIFEST perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
# Drop executable bit from documentation # Drop executable bit from documentation
chmod -x tools/git-log.pl chmod -x tools/git-log.pl
%build %build
perl Makefile.PL INSTALLDIRS=vendor perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1
make %{?_smp_mflags} %{make_build}
%install %install
make pure_install DESTDIR=$RPM_BUILD_ROOT %{make_install}
find $RPM_BUILD_ROOT -type f -name .packlist -delete
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
@ -105,6 +109,46 @@ make test
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.30-17
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.30-16
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 18 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.30-14
- Disable support output to PDF on RHEL
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.30-12
- Perl 5.32 rebuild
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jul 29 2019 Petr Pisar <ppisar@redhat.com> - 0.30-10
- Remove a bogus test that fails on PDF binary files randomly (CPAN RT#130221)
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.30-8
- Perl 5.30 rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Jun 29 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.30-5
- Perl 5.28 rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-4 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild