perl/perl-Git-Repository
SHA256
8
0
Fork 0
forked from pool/perl-Git-Repository
Code Pull Requests Activity

fix build

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-Git-Repository?expand=0&rev=24
This commit is contained in:
Dirk Stoecker
2023-03-25 11:28:17 +00:00
committed by Git OBS Bridge
parent f1887bbe2c
commit fdedda161d
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cpanspec.yml
View File

@@ -7,6 +7,7 @@
patches:
https://salsa.debian.org/perl-team/modules/packages/libgit-repository-perl/-/raw/c5e0eca06ca27fdaa547634b1e49f4637e7c1ca6/debian/patches/git-2.30.0.patch: -p1 PATCH-FIX-UPSTREAM https://rt.cpan.org/Public/Ticket/Attachment/1923740/1029935
https://patch-diff.githubusercontent.com/raw/book/Git-Repository/pull/22.patch: -p1 PATCH-FIX-UPSTREAM https://github.com/book/Git-Repository/pull/22
git-2.40.0.patch: -p1 PATCH-FIX-UPSTREAM https://github.com/book/Git-Repository/pull/23
preamble: |-
BuildRequires: git-core
#post_prep: |-

13
git-2.40.0.patch Normal file
View File

@@ -0,0 +1,13 @@
--- a/t/20-simple.t
+++ b/t/20-simple.t
@@ -85,6 +85,9 @@
skip "this test does not work with msysgit on Win32", 2
if $^O eq 'MSWin32';
+ skip "'git var GIT_EDITOR' behaviour was changed in git 2.40.0, and we have $version", 2
+ if Git::Repository->version_ge('2.40.0');
+
ok( !eval { $r->run( var => 'GIT_EDITOR' ); 1; }, 'git var GIT_EDITOR' );
like(
$@,

5
perl-Git-Repository.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 25 11:27:20 UTC 2023 - Dirk Stoecker <opensuse@dstoecker.de>
- add patch git-2.40.0.patch to addapt to git 2.40 changes
-------------------------------------------------------------------
Sat Dec 3 11:00:22 UTC 2022 - Stephan Kulow <coolo@suse.com>

9
perl-Git-Repository.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package perl-Git-Repository
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,12 @@ Summary: Perl interface to Git repositories
URL: https://metacpan.org/release/%{cpan_name}
Source0: https://cpan.metacpan.org/authors/id/B/BO/BOOK/%{cpan_name}-%{version}.tar.gz
Source1: cpanspec.yml
# PATCH-FIX-UPSTREAM https://github.com/book/Git-Repository/pull/23
Patch0: git-2.40.0.patch
# PATCH-FIX-UPSTREAM https://github.com/book/Git-Repository/pull/22
Patch0: https://patch-diff.githubusercontent.com/raw/book/Git-Repository/pull/22.patch
Patch1: https://patch-diff.githubusercontent.com/raw/book/Git-Repository/pull/22.patch
# PATCH-FIX-UPSTREAM https://rt.cpan.org/Public/Ticket/Attachment/1923740/1029935
Patch1: https://salsa.debian.org/perl-team/modules/packages/libgit-repository-perl/-/raw/c5e0eca06ca27fdaa547634b1e49f4637e7c1ca6/debian/patches/git-2.30.0.patch
Patch2: https://salsa.debian.org/perl-team/modules/packages/libgit-repository-perl/-/raw/c5e0eca06ca27fdaa547634b1e49f4637e7c1ca6/debian/patches/git-2.30.0.patch
BuildArch: noarch
BuildRequires: perl
BuildRequires: perl-macros
@@ -72,6 +74,7 @@ See Git::Repository::Tutorial for more code examples.
%prep
%autosetup -n %{cpan_name}-%{version} -p1
find . -type f ! -path "*/t/*" ! -name "*.pl" ! -path "*/bin/*" ! -path "*/script/*" ! -name "configure" -print0 | xargs -0 chmod 644
%build