From fc64c1064dc34f50f12573e142c67260dd06dd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= <con...@redhat.com> Date: Wed, 2 Dec 2015 17:09:50 +0100 Subject: 1.316 bump
--- .gitignore | 1 + Git-Repository-1.315-git-2.5.2-compat.patch | 33 ----------------------------- perl-Git-Repository.spec | 10 ++++----- sources | 2 +- 4 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 Git-Repository-1.315-git-2.5.2-compat.patch diff --git a/.gitignore b/.gitignore index a43c7d3..9172ee4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Git-Repository-1.312.tar.gz /Git-Repository-1.314.tar.gz /Git-Repository-1.315.tar.gz +/Git-Repository-1.316.tar.gz diff --git a/Git-Repository-1.315-git-2.5.2-compat.patch b/Git-Repository-1.315-git-2.5.2-compat.patch deleted file mode 100644 index 8e5e29e..0000000 --- a/Git-Repository-1.315-git-2.5.2-compat.patch +++ /dev/null @@ -1,33 +0,0 @@ -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 a0bd322..95cb7b3 100644 --- a/perl-Git-Repository.spec +++ b/perl-Git-Repository.spec @@ -1,12 +1,10 @@ Name: perl-Git-Repository -Version: 1.315 -Release: 2%{?dist} +Version: 1.316 +Release: 1%{?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 @@ -52,7 +50,6 @@ 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 @@ -77,6 +74,9 @@ make test %{perl_vendorlib}/Test %changelog +* Wed Dec 02 2015 Petr Šabata <con...@redhat.com> - 1.316-1 +- 1.316 bump + * 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) diff --git a/sources b/sources index dac68ae..23bd8c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a33546053e47ed3511f6e6fc089e72b3 Git-Repository-1.315.tar.gz +bd907119a024e6c014acfb5af648950c Git-Repository-1.316.tar.gz -- cgit v0.11.2 http://pkgs.fedoraproject.org/cgit/perl-Git-Repository.git/commit/?h=f22&id=fc64c1064dc34f50f12573e142c67260dd06dd60 -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org http://lists.fedoraproject.org/admin/lists/perl-devel@lists.fedoraproject.org