Update to 0.24.1 (RHBZ #1348750)

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Gnatenko 2016-06-22 07:51:02 +02:00
parent 518e56814d
commit f135c575a1
6 changed files with 13 additions and 60 deletions

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/pygit2-0.23.1.tar.gz
/pygit2-0.23.3.tar.gz
/pygit2-0.24.0.tar.gz
/pygit2-0.24.1.tar.gz

View File

@ -1,4 +1,4 @@
From 4859d36a47f74e10d2d92283f4ba6f0b35f162cd Mon Sep 17 00:00:00 2001
From f1f5d489da6c0a710563d517b11c116ea41d90ec Mon Sep 17 00:00:00 2001
From: Mathieu Bridon <bochecha@daitauha.fr>
Date: Wed, 21 Jan 2015 09:33:46 +0100
Subject: [PATCH] Remove remote-calling unit tests
@ -59,3 +59,6 @@ index 5590ea2..a2f16ca 100644
def test_clone_with_checkout_branch(self):
# create a test case which isolates the remote
test_repo = clone_repository('./test/data/testrepo.git',
--
2.9.0

View File

@ -1,26 +0,0 @@
From a922ced80d635f2aef73bf7a647672b8df7a7914 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Fri, 15 Apr 2016 14:07:33 +0200
Subject: [PATCH] repository: SYMTYPE is constant in module tarfile, not in any
class
Reference: https://github.com/libgit2/pygit2/issues/618
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
(cherry picked from commit 270dad8cd39b0f1dbb34256b389eb1bb458779de)
---
pygit2/repository.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pygit2/repository.py b/pygit2/repository.py
index e9bbdc6..88cc888 100644
--- a/pygit2/repository.py
+++ b/pygit2/repository.py
@@ -799,7 +799,7 @@ class Repository(_Repository):
info.mtime = timestamp
info.uname = info.gname = 'root' # just because git does this
if entry.mode == GIT_FILEMODE_LINK:
- info.type = archive.SYMTYPE
+ info.type = tarfile.SYMTYPE
info.linkname = content
info.mode = 0o777 # symlinks get placeholder
info.size = 0

View File

@ -1,26 +0,0 @@
From 7d296f33e67f53783856c045a7f21a9df75dd91e Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Fri, 15 Apr 2016 14:13:47 +0200
Subject: [PATCH] repository: decode() linkname
Reference: https://github.com/libgit2/pygit2/issues/620
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
(cherry picked from commit fd9a39a91b11964b8b88fdb4caf51ffdc559a6fa)
---
pygit2/repository.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pygit2/repository.py b/pygit2/repository.py
index 88cc888..4cf1a80 100644
--- a/pygit2/repository.py
+++ b/pygit2/repository.py
@@ -800,7 +800,8 @@ class Repository(_Repository):
info.uname = info.gname = 'root' # just because git does this
if entry.mode == GIT_FILEMODE_LINK:
info.type = tarfile.SYMTYPE
- info.linkname = content
+ info.type = archive.SYMTYPE
+ info.linkname = content.decode("utf-8")
info.mode = 0o777 # symlinks get placeholder
info.size = 0
archive.addfile(info)

View File

@ -1,16 +1,14 @@
%global pkgname pygit2
Name: python-%{pkgname}
Version: 0.24.0
Release: 3%{?dist}
Version: 0.24.1
Release: 1%{?dist}
Summary: Python bindings for libgit2
License: GPLv2 with linking exception
URL: http://www.pygit2.org
Source0: http://pypi.python.org/packages/source/p/%{pkgname}/%{pkgname}-%{version}.tar.gz
Source0: https://github.com/libgit2/%{pkgname}/archive/v%{version}/%{pkgname}-%{version}.tar.gz
Patch0001: 0001-repository-SYMTYPE-is-constant-in-module-tarfile-not.patch
Patch0002: 0002-repository-decode-linkname.patch
Patch0003: 0003-Remove-remote-calling-unit-tests.patch
Patch0001: 0001-Remove-remote-calling-unit-tests.patch
BuildRequires: libgit2-devel
BuildRequires: openssl-devel
@ -99,6 +97,9 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
%doc docs/_build/html/*
%changelog
* Wed Jun 22 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.24.1-1
- Update to 0.24.1 (RHBZ #1348750)
* Mon Apr 18 2016 Igor Gnatenko <ignatenko@redhat.com> 0.24.0-3
- Remove remote-calling unit tests
- repository: decode() linkname

View File

@ -1 +1 @@
05f62d21f054c1a1559a726c7fdaeff1 pygit2-0.24.0.tar.gz
d9915e3f8a7da65af3ea70f5bc02967d pygit2-0.24.1.tar.gz