X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=blobdiff_plain;f=git-core.spec;h=11e56238eddd3527af1228da1fc089630286794b;hp=a7b15fd7e4851c547969049227dfe5629a57ddd1;hb=eee65439dbe64b9980e0c14d9f54303cd4ecf7f8;hpb=cfe5bf901d7dbcba757ddbd2d9a1cbcf1c7be6e5

diff --git a/git-core.spec b/git-core.spec
index a7b15fd..11e5623 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,12 +14,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.30.0
+Version:	2.31.0
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
-Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
-# Source0-md5:	2457ee7e198bb949fecb0af94f7361a3
+Source0:	https://www.kernel.org/pub/software/scm/git/git-%{version}.tar.xz
+# Source0-md5:	c7f808ab107b666af45fccb56b9d9676
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -60,10 +60,12 @@ BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.745
+BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	tar >= 1:1.22
 %if %{with tk}
 # wish
 BuildRequires:	tk
+BuildRequires:	xz
 %endif
 BuildRequires:	zlib-devel
 %if %{with doc}
@@ -156,7 +158,7 @@ katalogu.
 Summary:	Documentation for git-core
 Summary(pl.UTF-8):	Dokumentacja do git-core
 Group:		Documentation
-%{?noarchpackage}
+BuildArch:	noarch
 
 %description doc
 Documentation for git-core.
@@ -221,7 +223,7 @@ Summary(pl.UTF-8):	Napisany w Tcl/Tk interfejs do systemu kontroli wersji Git
 Group:		Development/Tools
 Requires:	%{name} = %{version}-%{release}
 Requires:	tk
-%{?noarchpackage}
+BuildArch:	noarch
 
 %description gitk
 gitk displays changes in a repository or a selected set of commits.
@@ -387,7 +389,7 @@ Summary(pl.UTF-8):	bashowe uzupełnianie nazw dla gita
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion >= 2.0
-%{?noarchpackage}
+BuildArch:	noarch
 
 %description -n bash-completion-git
 This package provides bash-completion for git.
@@ -400,7 +402,7 @@ Summary:	Perl interface to the Git version control system
 Summary(pl.UTF-8):	Perlowy interfejs do systemu kontroli wersji Git
 Group:		Development/Languages/Perl
 Obsoletes:	perl-git-core
-%{?noarchpackage}
+BuildArch:	noarch
 
 %description -n perl-Git
 This module provides Perl scripts easy way to interface the Git
@@ -710,6 +712,7 @@ fi
 %{_mandir}/man5/gitattributes.5*
 %{_mandir}/man5/githooks.5*
 %{_mandir}/man5/gitignore.5*
+%{_mandir}/man5/gitmailmap.5*
 %{_mandir}/man5/gitmodules.5*
 %{_mandir}/man5/gitrepository-layout.5*
 %{_mandir}/man7/gitcli.7*