fix t8005-blame-i18n test to work with grep >= 2.22-2

[packages/git-core.git] / git-core.spec

diff --git a/git-core.spec b/git-core.spec
index abbf10540b04b306e283781323bbb0c09989f9d4..105e0b27ec5fa4bb4ad0b31c332d5a1ecc6d2a9f 100644 (file)
--- 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.3.2
-Release:       1
+Version:       2.7.1
+Release:       2
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
-# Source0-md5: 1e9141d60940eeda6b3d04646b2e8d1a
+# Source0-md5: 846ac45a1638e9a6ff3a9b790f6c8d99
 Source1:       %{name}-gitweb.conf
 Source2:       %{name}-gitweb-httpd.conf
 Source3:       %{name}-gitweb-lighttpd.conf
@@ -31,6 +31,7 @@ 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
@@ -62,7 +63,10 @@ BuildRequires:       xmlto
 BuildRequires: cvs-gnu-client < 1.13
 BuildRequires: cvs-gnu-client >= 1.12
 %endif
-%{?with_tests_svn:BuildRequires:  subversion}
+%if %{with tests_svn}
+BuildRequires: perl-subversion
+BuildRequires: subversion
+%endif
 Conflicts:     pdksh < 5.2.14-46
 %endif
 # git-sh-setup: sane_grep
@@ -433,6 +437,7 @@ Moduł trzeba zarejestrować poleceniem:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p0
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 
@@ -704,6 +709,7 @@ fi
 %dir %{_datadir}/gitk/lib
 %dir %{_datadir}/gitk/lib/msgs
 %lang(bg) %{_datadir}/gitk/lib/msgs/bg.msg
+%lang(ca) %{_datadir}/gitk/lib/msgs/ca.msg
 %lang(de) %{_datadir}/gitk/lib/msgs/de.msg
 %lang(es) %{_datadir}/gitk/lib/msgs/es.msg
 %lang(fr) %{_datadir}/gitk/lib/msgs/fr.msg
@@ -758,6 +764,7 @@ fi
 %lang(pt_br) %{_datadir}/git-gui/lib/msgs/pt_br.msg
 %lang(ru) %{_datadir}/git-gui/lib/msgs/ru.msg
 %lang(sv) %{_datadir}/git-gui/lib/msgs/sv.msg
+%lang(vi) %{_datadir}/git-gui/lib/msgs/vi.msg
 %lang(zh_CN) %{_datadir}/git-gui/lib/msgs/zh_cn.msg
 
 %files arch