From b9c06521a89ed9cd486037ebf5d03c77c581d759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= <con...@redhat.com> Date: Mon, 21 Sep 2015 16:57:10 +0200 Subject: Make the test suite compatible with git 2.5.2+ (rt#107219, rhbz#1264744)
diff --git a/Git-Repository-1.315-git-2.5.2-compat.patch b/Git-Repository-1.315-git-2.5.2-compat.patch new file mode 100644 index 0000000..8e5e29e --- /dev/null +++ b/Git-Repository-1.315-git-2.5.2-compat.patch @@ -0,0 +1,33 @@ +From 05f7008aa3ae32c8556e7907c65d9d16bebaabd9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= <con...@redhat.com> +Date: Mon, 21 Sep 2015 16:47:51 +0200 +Subject: [PATCH] git-2.5.2 test suite compatibility fix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The latest version of git altered the error message `git log -1' prints +on empty repositories. This patch extends the test to deal with this +situation. + +Signed-off-by: Petr Šabata <con...@redhat.com> +--- + t/24-errors.t | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/24-errors.t b/t/24-errors.t +index 7d7f2ee..aeb2c58 100644 +--- a/t/24-errors.t ++++ b/t/24-errors.t +@@ -56,7 +56,7 @@ my @tests = ( + { test_repo => [], + cmd => [qw( log -1 )], + exit => 128, +- dollar_at => qr/^fatal: bad default revision 'HEAD' /, ++ dollar_at => qr/^fatal: (?:bad default revision 'HEAD' |your current branch 'master' does not have any commits yet)/, + }, + + # create the empty tree +-- +2.4.3 + diff --git a/perl-Git-Repository.spec b/perl-Git-Repository.spec index b25aaf2..a0bd322 100644 --- a/perl-Git-Repository.spec +++ b/perl-Git-Repository.spec @@ -1,10 +1,12 @@ Name: perl-Git-Repository Version: 1.315 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl interface to Git repositories License: GPL+ or Artistic URL: http://search.cpan.org/dist/Git-Repository/ Source0: http://www.cpan.org/authors/id/B/BO/BOOK/Git-Repository-%{version}.tar.gz +# rt#107219, rhbz#1264744 +Patch0: Git-Repository-1.315-git-2.5.2-compat.patch BuildArch: noarch # Build BuildRequires: make @@ -50,6 +52,7 @@ require the creation and management of a Git repository. %prep %setup -q -n Git-Repository-%{version} +%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 @@ -74,6 +77,9 @@ make test %{perl_vendorlib}/Test %changelog +* Mon Sep 21 2015 Petr Šabata <con...@redhat.com> - 1.315-2 +- Make the test suite compatible with git 2.5.2+ (rt#107219, rhbz#1264744) + * Thu Jul 30 2015 Petr Šabata <con...@redhat.com> - 1.315-1 - 1.315 bump -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-Git-Repository.git/commit/?h=master&id=b9c06521a89ed9cd486037ebf5d03c77c581d759 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel