[packages/git-core] up to 2.7.3

atler atler at pld-linux.org
Sat Mar 12 01:00:04 CET 2016


commit f0f208009b27fded1c8d51cff03d8028aaff7bca
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Mar 12 00:59:41 2016 +0100

    up to 2.7.3
    
    - grep patch no longer needed

 git-core-test-grep.patch | 38 --------------------------------------
 git-core.spec            |  6 ++----
 2 files changed, 2 insertions(+), 42 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index a379bd2..2507d15 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -13,12 +13,12 @@
 Summary:	Distributed version control system focused on speed, effectivity and usability
 Summary(pl.UTF-8):	Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:		git-core
-Version:	2.7.2
+Version:	2.7.3
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
-# Source0-md5:	162ddc6c9b243899ad67ebd6b1c166b1
+# Source0-md5:	cf6ed3510f0d7784da5e9f4e64c6a43e
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -31,7 +31,6 @@ Patch1:		%{name}-key-bindings.patch
 Patch2:		%{name}-sysconfdir.patch
 Patch3:		cherry-picked-commitlog.patch
 Patch4:		%{name}-svn-exit-errors.patch
-Patch5:		%{name}-test-grep.patch
 URL:		http://git-scm.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -471,7 +470,6 @@ Moduł trzeba zarejestrować poleceniem:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p0
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 
diff --git a/git-core-test-grep.patch b/git-core-test-grep.patch
deleted file mode 100644
index 20e3b1d..0000000
--- a/git-core-test-grep.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- t/t8005-blame-i18n.sh.orig	2016-02-06 17:47:21.108000446 +0100
-+++ t/t8005-blame-i18n.sh	2016-02-06 17:48:04.231487635 +0100
-@@ -36,7 +36,7 @@
- test_expect_success !MINGW \
- 	'blame respects i18n.commitencoding' '
- 	git blame --incremental file | \
--		egrep "^(author|summary) " > actual &&
-+		egrep -a "^(author|summary) " > actual &&
- 	test_cmp actual expected
- '
- 
-@@ -53,7 +53,7 @@
- 	'blame respects i18n.logoutputencoding' '
- 	git config i18n.logoutputencoding eucJP &&
- 	git blame --incremental file | \
--		egrep "^(author|summary) " > actual &&
-+		egrep -a "^(author|summary) " > actual &&
- 	test_cmp actual expected
- '
- 
-@@ -69,7 +69,7 @@
- test_expect_success !MINGW \
- 	'blame respects --encoding=UTF-8' '
- 	git blame --incremental --encoding=UTF-8 file | \
--		egrep "^(author|summary) " > actual &&
-+		egrep -a "^(author|summary) " > actual &&
- 	test_cmp actual expected
- '
- 
-@@ -85,7 +85,7 @@
- test_expect_success !MINGW \
- 	'blame respects --encoding=none' '
- 	git blame --incremental --encoding=none file | \
--		egrep "^(author|summary) " > actual &&
-+		egrep -a "^(author|summary) " > actual &&
- 	test_cmp actual expected
- '
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/f0f208009b27fded1c8d51cff03d8028aaff7bca



More information about the pld-cvs-commit mailing list