rpms
/
perl-Alien-Build
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.28 bump

This commit is contained in:
Petr Písař 2017-11-03 13:32:48 +01:00
parent 3dbb29e271
commit 0d5ea3297f
4 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/Alien-Build-1.10.tar.gz
/Alien-Build-1.16.tar.gz
/Alien-Build-1.18.tar.gz
/Alien-Build-1.28.tar.gz

61
Alien-Build-1.18-Remove-redundant-pkgconfig-implementations.patch → Alien-Build-1.28-Remove-redundant-pkgconfig-implementations.patch
View File

@ -1,4 +1,4 @@
From c00c30fb159f4a90a57191ffbcfe665923ee1455 Mon Sep 17 00:00:00 2001
From fa94c01f3c8c8547fa74273b3dc16e74cdd6293d 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
@ -17,16 +17,16 @@ Signed-off-by: Petr Písař <ppisar@redhat.com>
lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm | 16 +--
t/01_use.t | 4 -
t/alien_build_plugin_pkgconfig_negotiate.t | 2 +-
t/alien_build_plugin_pkgconfig_negotiate__pick.t | 139 ++---------------------
6 files changed, 11 insertions(+), 158 deletions(-)
t/alien_build_plugin_pkgconfig_negotiate__pick.t | 155 ++---------------------
6 files changed, 11 insertions(+), 174 deletions(-)
diff --git a/MANIFEST b/MANIFEST
index 655a1a2..e6d3798 100644
index 8823a8d..85f3758 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -144,11 +144,9 @@ lib/Alien/Build/Plugin/Fetch/Local.pm
lib/Alien/Build/Plugin/Fetch/LocalDir.pm
@@ -164,11 +164,9 @@ lib/Alien/Build/Plugin/Fetch/LocalDir.pm
lib/Alien/Build/Plugin/Fetch/NetFTP.pm
lib/Alien/Build/Plugin/Fetch/Wget.pm
lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm
-lib/Alien/Build/Plugin/PkgConfig/CommandLine.pm
lib/Alien/Build/Plugin/PkgConfig/LibPkgConf.pm
@ -36,8 +36,8 @@ index 655a1a2..e6d3798 100644
lib/Alien/Build/Plugin/Prefer.pod
lib/Alien/Build/Plugin/Prefer/BadVersion.pm
lib/Alien/Build/Plugin/Prefer/SortVersions.pm
@@ -213,12 +211,10 @@ t/alien_build_plugin_fetch_lwp.t
t/alien_build_plugin_fetch_netftp.t
@@ -237,12 +235,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
-t/alien_build_plugin_pkgconfig_commandline.t
@ -50,12 +50,12 @@ index 655a1a2..e6d3798 100644
t/alien_build_plugin_prefer_sortversions.t
t/alien_build_plugin_probe_cbuilder.t
diff --git a/Makefile.PL b/Makefile.PL
index 253cfdd..039543d 100644
index 44b7d77..a41f67a 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -71,11 +71,9 @@ my %WriteMakefileArgs = (
"lib/Alien/Build/Plugin/Fetch/LocalDir.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Fetch/LocalDir.pm",
@@ -74,11 +74,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",
"lib/Alien/Build/Plugin/Gather/IsolateDynamic.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Gather/IsolateDynamic.pm",
- "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",
@ -65,7 +65,7 @@ index 253cfdd..039543d 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/SortVersions.pm" => "\$(INST_LIB)/Alien/Build/Plugin/Prefer/SortVersions.pm",
@@ -181,4 +179,4 @@ sub requires { goto &runtime_requires }
@@ -180,4 +178,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 253cfdd..039543d 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 d8f3af2..ba6d875 100644
index 5524b53..7b22707 100644
--- a/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
+++ b/lib/Alien/Build/Plugin/PkgConfig/Negotiate.pm
@@ -3,9 +3,7 @@ package Alien::Build::Plugin::PkgConfig::Negotiate;
@ -115,12 +115,12 @@ index d8f3af2..ba6d875 100644
}
diff --git a/t/01_use.t b/t/01_use.t
index a2dc604..c52e3ce 100644
index 3460c30..afceed7 100644
--- a/t/01_use.t
+++ b/t/01_use.t
@@ -37,11 +37,9 @@ require_ok 'Alien::Build::Plugin::Fetch::Local';
require_ok 'Alien::Build::Plugin::Fetch::LocalDir';
@@ -40,11 +40,9 @@ require_ok 'Alien::Build::Plugin::Fetch::LocalDir';
require_ok 'Alien::Build::Plugin::Fetch::NetFTP';
require_ok 'Alien::Build::Plugin::Fetch::Wget';
require_ok 'Alien::Build::Plugin::Gather::IsolateDynamic';
-require_ok 'Alien::Build::Plugin::PkgConfig::CommandLine';
require_ok 'Alien::Build::Plugin::PkgConfig::LibPkgConf';
@ -130,9 +130,9 @@ index a2dc604..c52e3ce 100644
require_ok 'Alien::Build::Plugin::Prefer::BadVersion';
require_ok 'Alien::Build::Plugin::Prefer::SortVersions';
require_ok 'Alien::Build::Plugin::Probe::CBuilder';
@@ -90,11 +88,9 @@ ok(-f 't/alien_build_plugin_fetch_local.t', 'test for Alien::Build::Plugin::Fetc
ok(-f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::Build::Plugin::Fetch::LocalDir');
@@ -97,11 +95,9 @@ ok(-f 't/alien_build_plugin_fetch_localdir.t', 'test for Alien::Build::Plugin::F
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');
-ok(-f 't/alien_build_plugin_pkgconfig_commandline.t', 'test for Alien::Build::Plugin::PkgConfig::CommandLine');
ok(-f 't/alien_build_plugin_pkgconfig_libpkgconf.t', 'test for Alien::Build::Plugin::PkgConfig::LibPkgConf');
@ -156,7 +156,7 @@ index 95e0d84..9492ea1 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 b0797ca..e68ff05 100644
index 70181a4..4d88c91 100644
--- a/t/alien_build_plugin_pkgconfig_negotiate__pick.t
+++ b/t/alien_build_plugin_pkgconfig_negotiate__pick.t
@@ -24,9 +24,10 @@ subtest 'LibPkgConf' => sub {
@ -187,7 +187,7 @@ index b0797ca..e68ff05 100644
);
};
@@ -55,131 +57,6 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new(
@@ -55,146 +57,5 @@ my $make_pkgconfig_libpkgconf_unavailable = Test2::Mock->new(
],
);
@ -225,6 +225,22 @@ index b0797ca..e68ff05 100644
- ],
- );
-
- my $mock2 = Test2::Mock->new(
- class => 'Alien::Build::Plugin::PkgConfig::Negotiate',
- );
-
- if($^O eq 'solaris') {
- $mock2->override(
- _perl_config => sub {
- my($key) = @_;
- if($key eq 'osname')
- { return 'linux' }
- else
- { return $Config{$key} }
- },
- );
- }
-
- subtest 'no command line' => sub {
-
- %which = ();
@ -278,7 +294,6 @@ index b0797ca..e68ff05 100644
-
- # From the old AB::MB days we prefer PkgConfig.pm
- # for 64 bit solaris over the command line pkg-config
- local $^O = 'solaris';
-
- my $mock2 = Test2::Mock->new(
- class => 'Alien::Build::Plugin::PkgConfig::Negotiate',
@ -316,9 +331,9 @@ index b0797ca..e68ff05 100644
- };
-
-};
-
done_testing;
--
2.13.5
2.13.6

9
perl-Alien-Build.spec
View File

@ -2,7 +2,7 @@
%{bcond_without perl_Alien_Build_enables_optional_test}
Name: perl-Alien-Build
Version: 1.18
Version: 1.28
Release: 1%{?dist}
Summary: Build external dependencies for use in CPAN
License: GPL+ or Artistic
@ -10,7 +10,7 @@ URL: http://search.cpan.org/dist/Alien-Build/
Source0: http://www.cpan.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-1.18-Remove-redundant-pkgconfig-implementations.patch
Patch0: Alien-Build-1.28-Remove-redundant-pkgconfig-implementations.patch
BuildArch: noarch
BuildRequires: make
BuildRequires: perl-generators
@ -104,6 +104,7 @@ BuildRequires: perl(URI::file)
# make in the lib/Alien/Build/Plugin/Build/Make.pm plugin
# make or Alien::gmake
BuildRequires: make
Suggests: curl
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%if !%{defined perl_bootstrap}
# Build cycle: perl-Alien-cmake3 → perl-Alien-Build
@ -134,6 +135,7 @@ Requires: perl(Test2::Require) >= 0.000060
Requires: perl(Text::ParseWords) >= 3.26
# YAML or Data::Dumper
Requires: perl(YAML)
Suggests: wget
# Do not gather dependencies from the documentation
%{?perl_default_filter}
@ -173,6 +175,9 @@ make test
%{_mandir}/man3/*
%changelog
* Fri Nov 03 2017 Petr Pisar <ppisar@redhat.com> - 1.28-1
- 1.28 bump
* Tue Sep 26 2017 Petr Pisar <ppisar@redhat.com> - 1.18-1
- 1.18 bump

2
sources
View File

@ -1 +1 @@
SHA512 (Alien-Build-1.18.tar.gz) = 06f25c156167d3d15a5b51daf694c67d6a7b164ceebedb81a3ee7b2ea4a81649b2a58ede3bb46f867862c7e37b0f30d0e37bf43d5f1f68231dc938d58ce55628
SHA512 (Alien-Build-1.28.tar.gz) = 96c3e52b113ad114a166a7aa4bb82f162c90818d88e095a32bb28c66bacaf0431a2f66269f69f13df829458c79d317ed2aedc90e06371302f87001d0db8fcad1