Compare commits

...

5 Commits

Author SHA1 Message Date
Petr Písař ae8cec92a5 2.68 bump 2022-09-06 10:39:56 +02:00
Petr Písař 26851942f2 2.67 bump 2022-09-05 12:02:15 +02:00
Petr Písař 267f7d3c43 2.65 bump 2022-08-31 14:53:42 +02:00
Petr Písař 8b7af6d9cb 2.59 bump 2022-08-17 10:31:18 +02:00
Petr Písař 469bfe42f3 2.51 bump 2022-08-04 09:44:49 +02:00
5 changed files with 148 additions and 39 deletions

5
.gitignore vendored
View File

@ -69,3 +69,8 @@
/Alien-Build-2.47.tar.gz
/Alien-Build-2.48.tar.gz
/Alien-Build-2.50.tar.gz
/Alien-Build-2.51.tar.gz
/Alien-Build-2.59.tar.gz
/Alien-Build-2.65.tar.gz
/Alien-Build-2.67.tar.gz
/Alien-Build-2.68.tar.gz

View File

@ -0,0 +1,73 @@
From c2106ae1cda2da737f3a4202fc68fe9b758b6ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 17 Aug 2022 10:18:36 +0200
Subject: [PATCH] Remove redundant SHA implementations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
We keep Alien::Build::Plugin::Digest::SHA as it is based on
Digest::SHA.
Alien::Build::Plugin::Digest::SHAPP is removed because it
requires Digest::SHA::PurePerl which is not packaged.
Files are moved externally because of ever changing VERSION variables.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
MANIFEST | 2 --
Makefile.PL | 1 -
lib/Alien/Build/Plugin/Digest.pod | 4 ----
3 files changed, 7 deletions(-)
diff --git a/MANIFEST b/MANIFEST
index b9335ad..fc1eea9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -223,7 +223,6 @@ lib/Alien/Build/Plugin/Decode/Mojo.pm
lib/Alien/Build/Plugin/Digest.pod
lib/Alien/Build/Plugin/Digest/Negotiate.pm
lib/Alien/Build/Plugin/Digest/SHA.pm
-lib/Alien/Build/Plugin/Digest/SHAPP.pm
lib/Alien/Build/Plugin/Download.pod
lib/Alien/Build/Plugin/Download/Negotiate.pm
lib/Alien/Build/Plugin/Extract.pod
@@ -317,7 +316,6 @@ t/alien_build_plugin_decode_html.t
t/alien_build_plugin_decode_mojo.t
t/alien_build_plugin_digest_negotiate.t
t/alien_build_plugin_digest_sha.t
-t/alien_build_plugin_digest_shapp.t
t/alien_build_plugin_download_negotiate.t
t/alien_build_plugin_extract_archivetar.t
t/alien_build_plugin_extract_archivezip.t
diff --git a/Makefile.PL b/Makefile.PL
index 4c4c147..42f773f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -75,7 +75,6 @@ my %WriteMakefileArgs = (
"lib/Alien/Build/Plugin/Digest.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Digest.pod",
"lib/Alien/Build/Plugin/Digest/Negotiate.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Digest/Negotiate.pm",
"lib/Alien/Build/Plugin/Digest/SHA.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Digest/SHA.pm",
- "lib/Alien/Build/Plugin/Digest/SHAPP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Digest/SHAPP.pm",
"lib/Alien/Build/Plugin/Download.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Download.pod",
"lib/Alien/Build/Plugin/Download/Negotiate.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Download/Negotiate.pm",
"lib/Alien/Build/Plugin/Extract.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Extract.pod",
diff --git a/lib/Alien/Build/Plugin/Digest.pod b/lib/Alien/Build/Plugin/Digest.pod
index ef3b471..a1844f2 100644
--- a/lib/Alien/Build/Plugin/Digest.pod
+++ b/lib/Alien/Build/Plugin/Digest.pod
@@ -42,10 +42,6 @@ Negotiate the most appropriate plugin to calculate digest.
Use the XS based L<Digest::SHA> for computing SHA digests. This is the default since
L<Digest::SHA> comes with recent versions of Perl.
-=item L<Alien::Build::Plugin::Digest::SHAPP>
-
-Use the pure-perl based L<Digest::SHA::PurePerl> for computing SHA digests.
-
=back
=head1 SEE ALSO
--
2.37.2

View File

@ -1,4 +1,4 @@
From 528765b7282f2fd6a542ba476d8564a7e0d0f73f Mon Sep 17 00:00:00 2001
From 343c582db332d07f831420372ef8eab1eead0718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 8 Sep 2017 11:31:02 +0200
Subject: [PATCH] Remove redundant pkgconfig implementations
@ -21,13 +21,13 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
6 files changed, 11 insertions(+), 204 deletions(-)
diff --git a/MANIFEST b/MANIFEST
index 71e1559..d1f6060 100644
index 6f507b0..b9335ad 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -229,11 +229,9 @@ lib/Alien/Build/Plugin/Fetch/LocalDir.pm
lib/Alien/Build/Plugin/Fetch/NetFTP.pm
lib/Alien/Build/Plugin/Fetch/Wget.pm
@@ -243,11 +243,9 @@ lib/Alien/Build/Plugin/Fetch/Wget.pm
lib/Alien/Build/Plugin/Gather.pod
lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm
lib/Alien/Build/Plugin/PkgConfig.pod
-lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm
lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm
lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm
@ -36,7 +36,7 @@ index 71e1559..d1f6060 100644
lib/Alien/Build/Plugin/Prefer.pod
lib/Alien/Build/Plugin/Prefer/BadVersion.pm
lib/Alien/Build/Plugin/Prefer/GoodVersion.pm
@@ -319,12 +317,10 @@ t/alien_build_plugin_fetch_netftp.t
@@ -336,12 +334,10 @@ t/alien_build_plugin_fetch_netftp.t
t/alien_build_plugin_fetch_wget.t
t/alien_build_plugin_gather_isolatedynamic.t
t/alien_build_plugin_meta.t
@ -50,13 +50,13 @@ index 71e1559..d1f6060 100644
t/alien_build_plugin_prefer_goodversion.t
t/alien_build_plugin_prefer_sortversions.t
diff --git a/Makefile.PL b/Makefile.PL
index cde6585..242c1e9 100644
index 27b442e..4c4c147 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -87,11 +87,9 @@ my %WriteMakefileArgs = (
"lib/Alien/Build/Plugin/Fetch/NetFTP.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/NetFTP.pm",
"lib/Alien/Build/Plugin/Fetch/Wget.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/Wget.pm",
@@ -95,11 +95,9 @@ my %WriteMakefileArgs = (
"lib/Alien/Build/Plugin/Gather.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Gather.pod",
"lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Gather/IsolateDynamic.pm",
"lib/Alien/Build/Plugin/PkgConfig.pod" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig.pod",
- "lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/CommandLine.pm",
"lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm",
"lib/Alien/Build/Plugin/PkgConfig/MakeStatic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/PkgConfig/MakeStatic.pm",
@ -65,7 +65,7 @@ index cde6585..242c1e9 100644
"lib/Alien/Build/Plugin/Prefer.pod" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer.pod",
"lib/Alien/Build/Plugin/Prefer/BadVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/BadVersion.pm",
"lib/Alien/Build/Plugin/Prefer/GoodVersion.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/GoodVersion.pm",
@@ -204,4 +202,4 @@ sub requires { goto &runtime_requires }
@@ -218,4 +216,4 @@ sub requires { goto &runtime_requires }
sub runtime_requires {
my ( $module, $version_or_range ) = @_;
_add_prereq( PREREQ_PM => $module, $version_or_range );
@ -73,7 +73,7 @@ index cde6585..242c1e9 100644
\ No newline at end of file
+}
diff --git a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
index 795dc63..35d50d0 100644
index fd4cb62..de10c7c 100644
--- a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
+++ b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
@@ -4,9 +4,7 @@ use strict;
@ -124,7 +124,7 @@ index 795dc63..35d50d0 100644
}
diff --git a/t/01_use.t b/t/01_use.t
index 90073a5..d06da60 100644
index 0275da2..46875d0 100644
--- a/t/01_use.t
+++ b/t/01_use.t
@@ -46,11 +46,9 @@ require_ok 'Alien::Build::Plugin::Fetch::LocalDir';
@ -139,7 +139,7 @@ index 90073a5..d06da60 100644
require_ok 'Alien::Build::Plugin::Prefer::BadVersion';
require_ok 'Alien::Build::Plugin::Prefer::GoodVersion';
require_ok 'Alien::Build::Plugin::Prefer::SortVersions';
@@ -112,11 +110,9 @@ ok -f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::B
@@ -116,11 +114,9 @@ ok -f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::B
ok -f 't/alien_build_plugin_fetch_netftp.t', 'test for Alien::Build::Plugin::Fetch::NetFTP';
ok -f 't/alien_build_plugin_fetch_wget.t', 'test for Alien::Build::Plugin::Fetch::Wget';
ok -f 't/alien_build_plugin_gather_isolatedynamic.t', 'test for Alien::Build::Plugin::Gather::IsolateDynamic';
@ -165,10 +165,10 @@ index 1c2c71d..071a7b0 100644
local $ENV{ALIEN_BUILD_PKG_CONFIG} = "PkgConfig::$name";
subtest $ENV{ALIEN_BUILD_PKG_CONFIG} => sub {
diff --git a/t/alien_build_plugin_pkgconfig_negotiate__pick.t b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
index ece374e..2026d51 100644
index 9862014..54fb83d 100644
--- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t
+++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
@@ -25,9 +25,10 @@ subtest 'LibPkgConf' => sub {
@@ -27,9 +27,10 @@ subtest 'LibPkgConf' => sub {
local $PkgConfig::LibPkgConf::VERSION = '0.01';
@ -182,7 +182,7 @@ index ece374e..2026d51 100644
);
};
@@ -40,9 +41,10 @@ subtest 'LibPkgConf' => sub {
@@ -42,9 +43,10 @@ subtest 'LibPkgConf' => sub {
# cannot be loaded for the rest of this .t file
note scalar capture_merged { Devel::Hide->import(qw( PkgConfig::LibPkgConf )) };
@ -196,7 +196,7 @@ index ece374e..2026d51 100644
);
};
@@ -55,167 +57,5 @@ my $make_pkgconfig_libpkgconf_unavailable = mock 'Alien::Build::Plugin::PkgConfi
@@ -57,167 +59,5 @@ my $make_pkgconfig_libpkgconf_unavailable = mock 'Alien::Build::Plugin::PkgConfi
],
);
@ -365,5 +365,5 @@ index ece374e..2026d51 100644
done_testing;
--
2.25.4
2.37.2

View File

@ -7,18 +7,21 @@
%endif
Name: perl-Alien-Build
Version: 2.50
Release: 2%{?dist}
Version: 2.68
Release: 1%{?dist}
Summary: Build external dependencies for use in CPAN
# lib/Alien/Build/Plugin/Test/Mock.pm contains Base64-encoded files for tests
# (a bash script, C source file, a gzipped tar archive, Mach-O 64-bit x86_64
# object file and a static library).
License: GPL+ or Artistic
License: GPL-1.0-or-later OR Artistic-1.0-Perl
URL: https://metacpan.org/release/Alien-Build
Source0: https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/Alien-Build-%{version}.tar.gz
# Support only the most advanced pkgconfig implementation,
# the files are deleted in prep section
Patch0: Alien-Build-2.28-Remove-redundant-pkgconfig-implementations.patch
Patch0: Alien-Build-2.65-Remove-redundant-pkgconfig-implementations.patch
# Support only the most commog SHA implementation,
# the files are deleted in prep section
Patch1: Alien-Build-2.65-Remove-redundant-SHA-implementations.patch
BuildArch: noarch
BuildRequires: coreutils
BuildRequires: make
@ -114,12 +117,13 @@ BuildRequires: perl(Alien::Base::ModuleBuild) >= 0.040
%endif
BuildRequires: perl(Devel::Hide)
BuildRequires: perl(Env::ShellWords)
# FFI::Platypus not packaged
# HTTP::Tiny or curl
# (HTTP::Tiny and Mozilla::CA) or curl
BuildRequires: perl(HTTP::Tiny) >= 0.044
# Prefer Mojo::DOM with Mojolicious, URI, URI::Escape over Mojo::DOM58
BuildRequires: perl(Mojo::DOM)
BuildRequires: perl(Mojolicious) >= 7.00
# (HTTP::Tiny and Mozilla::CA) or curl
# Mozilla::CA not used
# PkgConfig not packaged
BuildRequires: perl(Readonly) >= 1.60
BuildRequires: perl(Sort::Versions)
@ -129,7 +133,6 @@ BuildRequires: perl(URI::file)
%endif
# Alien::Build::Plugin::Build::Copy executes cp
Requires: coreutils
Suggests: curl
# Alien::Base::Wrapper::cc() executes $Config{cc}.
Requires: gcc
# make in the lib/Alien/Build/Plugin/Build/CMake.pm plugin
@ -162,6 +165,10 @@ Recommends: perl(FFI::Platypus) >= 0.12
Requires: perl(Capture::Tiny) >= 0.17
Requires: perl(File::BOM)
Requires: perl(File::Find)
# (HTTP::Tiny and Mozilla::CA) or curl for Alien::Build::Plugin::Download::Negotiate
Requires: perl(HTTP::Tiny) >= 0.044
# (HTTP::Tiny and Mozilla::CA) or curl for Alien::Build::Plugin::Download::Negotiate
Requires: perl(Mozilla::CA)
Requires: perl(Path::Tiny) >= 0.077
# Alien::Build::Plugin::PkgConfig::Negotiate finds a pkgconfig implementation
# in this order:
@ -174,8 +181,7 @@ Requires: perl(Storable)
Requires: perl(Test2::API) >= 1.302096
Requires: perl(Text::ParseWords) >= 3.26
# YAML or Data::Dumper
Suggests: perl(YAML)
Suggests: wget
Recommends: perl(YAML)
# Test-Alien merged into Alien-Build
Obsoletes: perl-Test-Alien < 0.15-13
Provides: perl-Test-Alien = %{version}-%{release}
@ -188,8 +194,8 @@ Provides: perl-Test-Alien = %{version}-%{release}
# Remove private redefinitions
%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Alien::Build::rc\\)$
# Remove private modules
%global __provides_exclude %{__provides_exclude}|^perl\\(MyTest::.*\\)$
%global __requires_exclude %{__requires_exclude}|^perl\\(Alien::Build::Plugin::RogerRamjet|Alien::Foo|Alien::libfoo1|Alien::libfoo2|MyTest::.*\\)$
%global __provides_exclude %{__provides_exclude}|^perl\\(Alien::Build::Plugin::NesAdvantage::HelperTest|Alien::perlhelp|MyTest::.*\\)$
%global __requires_exclude %{__requires_exclude}|^perl\\(Alien::Build::Plugin::RogerRamjet|Alien::Foo|Alien::libfoo1|Alien::libfoo2|Alien::perlhelp|MyTest::.*\\)$
# Some tests, e.g. t/alien_build_plugin_extract_negotiate.t, compare a script file
# content against an archived one. Do not rewrite their shebangs.
@ -268,11 +274,13 @@ Requires: perl(Alien::Base::ModuleBuild) >= 0.040
Requires: perl(Devel::Hide)
Requires: perl(Env::ShellWords)
# FFI::Platypus not packaged
# HTTP::Tiny or curl
# (HTTP::Tiny and Mozilla::CA) or curl
Requires: perl(HTTP::Tiny) >= 0.044
# Prefer Mojo::DOM with Mojolicious, URI, URI::Escape over Mojo::DOM58
Requires: perl(Mojo::DOM)
Requires: perl(Mojolicious) >= 7.00
# (HTTP::Tiny and Mozilla::CA) or curl
# Mozilla::CA not used
# PkgConfig not packaged
Requires: perl(Readonly) >= 1.60
Requires: perl(Sort::Versions)
@ -287,10 +295,16 @@ with "%{_libexecdir}/%{name}/test".
%setup -q -n Alien-Build-%{version}
# Remove redundant pkgconfig implementations, keep
# Alien::Build::Plugin::PkgConfig::LibPkgConf,
# MANIFEST is updated by Remove-redundant-pkgconfig-implementations.patch
# MANIFEST is updated by Remove-redundant-pkgconfig-implementations.patch.
%patch0 -p1
rm lib/Alien/Build/Plugin/PkgConfig/{CommandLine,PP}.pm
rm t/alien_build_plugin_pkgconfig_{commandline,pp}.t
# Remove redundant SHA digest imlementations, keep
# Alien::Build::Plugin::Digest::SHA, MANIFEST is updated by
# Alien-Build-2.59-Remove-redundant-SHA-implementations.patch.
%patch1 -p1
rm lib/Alien/Build/Plugin/Digest/SHAPP.pm
rm t/alien_build_plugin_digest_shapp.t
# Remove unused tests
for F in \
t/bin/ftpd \
@ -358,9 +372,10 @@ cp -a %{_libexecdir}/%{name}/* "$DIR"
pushd "$DIR"
unset ACLOCAL_PATH ALIEN_BASE_WRAPPER_QUIET ALIEN_BUILD_LIVE_TEST \
ALIEN_BUILD_LOG ALIEN_BUILD_PKG_CONFIG ALIEN_BUILD_POSTLOAD \
ALIEN_BUILD_PRELOAD ALIEN_BUILD_RC ALIEN_BUILD_SITE_CONFIG ALIEN_FORCE \
ALIEN_INSTALL_NETWORK ALIEN_INSTALL_TYPE CIPDIST CONFIG_SITE CURL DESTDIR \
FOO1 FOO2 FOO3 VERBOSE WGET
ALIEN_BUILD_PRELOAD ALIEN_BUILD_RC ALIEN_BUILD_SITE_CONFIG \
ALIEN_DOWNLOAD_RULE ALIEN_FORCE \
ALIEN_INSTALL_NETWORK ALIEN_INSTALL_TYPE CONFIG_SITE CURL DESTDIR \
FOO1 FOO2 FOO3 TEST_ALIEN_ALIENS_MISSING TEST_ALIEN_ALWAYS_KEEP VERBOSE WGET
prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
popd
rm -r "$DIR"
@ -370,9 +385,10 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test
%check
unset ACLOCAL_PATH ALIEN_BASE_WRAPPER_QUIET ALIEN_BUILD_LIVE_TEST \
ALIEN_BUILD_LOG ALIEN_BUILD_PKG_CONFIG ALIEN_BUILD_POSTLOAD \
ALIEN_BUILD_PRELOAD ALIEN_BUILD_RC ALIEN_BUILD_SITE_CONFIG ALIEN_FORCE \
ALIEN_INSTALL_NETWORK ALIEN_INSTALL_TYPE CIPDIST CONFIG_SITE CURL DESTDIR \
FOO1 FOO2 FOO3 VERBOSE WGET
ALIEN_BUILD_PRELOAD ALIEN_BUILD_RC ALIEN_BUILD_SITE_CONFIG \
ALIEN_DOWNLOAD_RULE ALIEN_FORCE \
ALIEN_INSTALL_NETWORK ALIEN_INSTALL_TYPE CONFIG_SITE CURL DESTDIR \
FOO1 FOO2 FOO3 TEST_ALIEN_ALIENS_MISSING TEST_ALIEN_ALWAYS_KEEP VERBOSE WGET
export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print $1} else {print 1}' -- '%{?_smp_mflags}')
make test
@ -420,6 +436,21 @@ make test
%{_libexecdir}/%{name}
%changelog
* Tue Sep 06 2022 Petr Pisar <ppisar@redhat.com> - 2.68-1
- 2.68 bump
* Mon Sep 05 2022 Petr Pisar <ppisar@redhat.com> - 2.67-1
- 2.67 bump
* Wed Aug 31 2022 Petr Pisar <ppisar@redhat.com> - 2.65-1
- 2.65 bump
* Tue Aug 16 2022 Petr Pisar <ppisar@redhat.com> - 2.59-1
- 2.59 bump
* Thu Aug 04 2022 Petr Pisar <ppisar@redhat.com> - 2.51-1
- 2.51 bump
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.50-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (Alien-Build-2.50.tar.gz) = b4af4a2d7b4ef6c595df23d40358cf6495defea4065e5c8cd4d01cc8ecf6aecdbd89e0b2b9b6a969aab4b587b430cb2f8df9c3a518607edf21d7e3724d17763c
SHA512 (Alien-Build-2.68.tar.gz) = ecc97a7069f3c3c254710eae6237b4ef43abc75c88e7f0e405de877d817c1f2abd0caa797ffa3b8427fabb21e4063945040c2c4ceaa8631904cf45cecd191944