diff --git a/.gitignore b/.gitignore index 95fd05c..412765e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/HTTP-Negotiate-6.01.tar.gz +HTTP-Negotiate-6.01.tar.gz diff --git a/.perl-HTTP-Negotiate.metadata b/.perl-HTTP-Negotiate.metadata deleted file mode 100644 index ee793d6..0000000 --- a/.perl-HTTP-Negotiate.metadata +++ /dev/null @@ -1 +0,0 @@ -4a4974639d9b64f7132cb075f551f7293f788c62 SOURCES/HTTP-Negotiate-6.01.tar.gz diff --git a/0001-Fix-warning-in-test.patch b/0001-Fix-warning-in-test.patch new file mode 100644 index 0000000..d228dea --- /dev/null +++ b/0001-Fix-warning-in-test.patch @@ -0,0 +1,26 @@ +From 29bbbaf04a32ce01d3a1a486a6a39f694f321888 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Josef=20=C5=A0pa=C4=8Dek?= +Date: Thu, 1 Dec 2022 10:17:27 +0100 +Subject: [PATCH] Fix warning in test + +There are three variables and printf was print two only +--- + t/negotiate.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/negotiate.t b/t/negotiate.t +index ef3f889..fa9af51 100644 +--- a/t/negotiate.t ++++ b/t/negotiate.t +@@ -106,7 +106,7 @@ sub show_res + { + print "-------------\n"; + for (@_) { +- printf "%-6s %.3f\n", @$_; ++ printf "%-6s %.3f %6d\n", @$_; + } + print "-------------\n"; + } +-- +2.38.1 + diff --git a/SPECS/perl-HTTP-Negotiate.spec b/perl-HTTP-Negotiate.spec similarity index 50% rename from SPECS/perl-HTTP-Negotiate.spec rename to perl-HTTP-Negotiate.spec index 651c47a..e4b6501 100644 --- a/SPECS/perl-HTTP-Negotiate.spec +++ b/perl-HTTP-Negotiate.spec @@ -1,10 +1,11 @@ Name: perl-HTTP-Negotiate Version: 6.01 -Release: 19%{?dist} +Release: 40%{?dist} Summary: Choose a variant to serve -License: GPL+ or Artistic -URL: http://search.cpan.org/dist/HTTP-Negotiate/ -Source0: http://www.cpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-%{version}.tar.gz +License: GPL-1.0-or-later OR Artistic-1.0-Perl +URL: https://metacpan.org/release/HTTP-Negotiate +Source0: https://cpan.metacpan.org/authors/id/G/GA/GAAS/HTTP-Negotiate-%{version}.tar.gz +Patch0: 0001-Fix-warning-in-test.patch BuildArch: noarch BuildRequires: make BuildRequires: perl-interpreter @@ -18,7 +19,6 @@ BuildRequires: perl(HTTP::Headers) >= 6 # Tests only: BuildRequires: perl(HTTP::Request) BuildRequires: perl(Test) -Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(HTTP::Headers) >= 6 Conflicts: perl-libwww-perl < 6 @@ -32,15 +32,38 @@ negotiation algorithm specified in draft-ietf-http-v11-spec-00.ps chapter representation based upon attributes of the negotiable variants and the value of the various Accept* header fields in the request. +%package tests +Summary: Tests for %{name} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: perl-Test-Harness + +%description tests +Tests from %{name}. Execute them +with "%{_libexecdir}/%{name}/test". + %prep %setup -q -n HTTP-Negotiate-%{version} +%patch0 -p1 +# Help generators to recognize Perl scripts +for F in $(find t/ -name '*.t'); do + perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!\s*perl}{$Config{startperl}}' "$F" + chmod +x "$F" +done %build -perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 -make %{?_smp_mflags} +perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 +%{make_build} %install -make pure_install DESTDIR=%{buildroot} +%{make_install} +# Install tests +mkdir -p %{buildroot}%{_libexecdir}/%{name} +cp -a t %{buildroot}%{_libexecdir}/%{name} +cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF' +#!/bin/sh +cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)" -r +EOF +chmod +x %{buildroot}%{_libexecdir}/%{name}/test %{_fixperms} %{buildroot}/* %check @@ -51,7 +74,77 @@ make test %{perl_vendorlib}/* %{_mandir}/man3/* +%files tests +%{_libexecdir}/%{name} + %changelog +* Tue Oct 29 2024 Troy Dawson - 6.01-40 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 6.01-39 +- Bump release for June 2024 mass rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 6.01-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 6.01-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 6.01-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 6.01-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 01 2022 Michal Josef Špaček - 6.01-34 +- Package tests +- Patch for remove warning in test +- Simplify build and install phases +- Update license to SPDX format + +* Fri Jul 22 2022 Fedora Release Engineering - 6.01-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 31 2022 Jitka Plesnikova - 6.01-32 +- Perl 5.36 rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 6.01-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 6.01-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri May 21 2021 Jitka Plesnikova - 6.01-29 +- Perl 5.34 rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 6.01-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 6.01-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Jitka Plesnikova - 6.01-26 +- Perl 5.32 rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 6.01-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 6.01-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 31 2019 Jitka Plesnikova - 6.01-23 +- Perl 5.30 rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 6.01-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 6.01-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Jitka Plesnikova - 6.01-20 +- Perl 5.28 rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 6.01-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..6f92b57 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (HTTP-Negotiate-6.01.tar.gz) = 2651010f0d989fb255d37a0e4585de4779edcccd59fcad7d7f5ccc7d2c2ec420060324beebc880664d6c0d29193ce62f2d21cb6332bbfa0a3adacfa632876617