mirror of
https://abf.rosa.ru/djam/git.git
synced 2025-02-23 09:43:00 +00:00
New version 2.6.3
Backport patch from upstream to fix broken gitk
This commit is contained in:
parent
bf4d13a754
commit
1f59a9149d
3 changed files with 2587 additions and 5 deletions
5
.abf.yml
5
.abf.yml
|
@ -1,5 +1,2 @@
|
|||
removed_sources:
|
||||
git-1.7.11.3.tar.gz: a10c420e4d9152d6059f41825904cfac3062b135
|
||||
git-2.3.2.tar.xz: c7b0550c34109752bd25c4cd2007908df689b603
|
||||
sources:
|
||||
git-2.6.2.tar.xz: 5ff563d0589cc6e62a670c6546c1edcff81dda9a
|
||||
git-2.6.3.tar.xz: eb522811e095c8c972ab5724ab8e964cc13ebc0f
|
||||
|
|
2581
git-2.6.3-gitk.patch
Normal file
2581
git-2.6.3-gitk.patch
Normal file
File diff suppressed because it is too large
Load diff
6
git.spec
6
git.spec
|
@ -4,7 +4,7 @@
|
|||
|
||||
Summary: Global Information Tracker
|
||||
Name: git
|
||||
Version: 2.6.2
|
||||
Version: 2.6.3
|
||||
Release: 1
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
|
@ -15,6 +15,9 @@ Source2: gitweb.conf
|
|||
Source3: %{profile_branch}
|
||||
# Do we really need it? It's not used anyway
|
||||
Source4: %{profile_env}
|
||||
# Backport from upstream
|
||||
# https://github.com/git/git/commit/482456a414d69d8c44b92bbf73eb4ee53b5d8ab9
|
||||
Patch0: git-2.6.3-gitk.patch
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: docbook-dtd45-xml
|
||||
BuildRequires: xmlto
|
||||
|
@ -286,6 +289,7 @@ Shows the current git branch in your bash prompt.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
# remove borring file
|
||||
rm -f Documentation/.gitignore
|
||||
# prefix gitweb css/png files with /gitweb
|
||||
|
|
Loading…
Add table
Reference in a new issue