From 0fb2bd3bcf780cc2695da4c8df1f9bada84522f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Wed, 5 Jul 2017 19:31:37 +0300 Subject: [PATCH] Update to 2.13.2 --- .abf.yml | 4 +-- git-2.7.3-fix_translate.patch | 12 -------- git.spec | 54 ++++++++++++++++------------------- 3 files changed, 26 insertions(+), 44 deletions(-) delete mode 100644 git-2.7.3-fix_translate.patch diff --git a/.abf.yml b/.abf.yml index e2626c8..c97e785 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,2 @@ -removed_sources: - git-2.6.3.tar.xz: eb522811e095c8c972ab5724ab8e964cc13ebc0f sources: - git-2.7.3.tar.xz: d7be9af73cc56c606e0744beb0091b612b416909 + git-2.13.2.tar.xz: 2eb5d02274b63be803afec791143deaa4b8ad45a diff --git a/git-2.7.3-fix_translate.patch b/git-2.7.3-fix_translate.patch deleted file mode 100644 index f4e8e4c..0000000 --- a/git-2.7.3-fix_translate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN git-2.7.3/po/ru.po git-2.7.3-patched/po/ru.po ---- git-2.7.3/po/ru.po 2016-03-11 01:11:15.000000000 +0300 -+++ git-2.7.3-patched/po/ru.po 2016-08-14 11:43:14.000000000 +0300 -@@ -1752,7 +1752,7 @@ - - #: wt-status.c:263 - msgid "both modified:" --msgstr "оба измены:" -+msgstr "оба изменены:" - - #: wt-status.c:265 - #, c-format diff --git a/git.spec b/git.spec index 763ec61..38a5f85 100644 --- a/git.spec +++ b/git.spec @@ -4,8 +4,8 @@ Summary: Global Information Tracker Name: git -Version: 2.7.3 -Release: 2 +Version: 2.13.2 +Release: 1 Epoch: 1 License: GPLv2+ Group: Development/Tools @@ -15,7 +15,6 @@ Source2: gitweb.conf Source3: %{profile_branch} # Do we really need it? It's not used anyway Source4: %{profile_env} -Patch0: git-2.7.3-fix_translate.patch BuildRequires: asciidoc BuildRequires: docbook-dtd45-xml BuildRequires: xmlto @@ -32,7 +31,7 @@ Suggests: gitk = %{EVRD} Suggests: git-arch = %{EVRD} Suggests: git-core-oldies = %{EVRD} Suggests: git-cvs = %{EVRD} -Obsoletes: python-git +Obsoletes: python-git < 1:2.11 %description This is a stupid (but extremely fast) directory content manager. It @@ -47,7 +46,6 @@ This is a dummy package which brings in all subpackages. %files # no file in the main package - #---------------------------------------------------------------------------- %package -n git-core @@ -74,7 +72,7 @@ You may want to install subversion, cpsps and/or tla to import repositories from other VCS. %files -n git-core -f %{name}.lang -%doc README Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz +%doc Documentation/*.html Documentation/howto Documentation/technical Documentation/RelNotes.txt.gz %{_sysconfdir}/emacs/site-start.d/* %{_sysconfdir}/bash_completion.d/* %{_datadir}/emacs/site-lisp/* @@ -123,27 +121,26 @@ Requires: tk >= 8.4 Git revision tree visualiser. %files -n gitk -%doc README %{_bindir}/gitk %{_mandir}/*/gitk* %{_datadir}/gitk #---------------------------------------------------------------------------- -%package -n gitview -Summary: Git graphical revision tree visualiser -Group: Development/Other -Requires: git-core = %{EVRD} -Requires: python-cairo -Requires: pygtk2.0 -Requires: python-gtksourceview - -%description -n gitview -Git graphical revision tree visualiser. - -%files -n gitview -%doc contrib/gitview/gitview.txt -%{_bindir}/gitview +# %package -n gitview +# Summary: Git graphical revision tree visualiser +# Group: Development/Other +# Requires: git-core = %{EVRD} +# Requires: python-cairo +# Requires: pygtk2.0 +# Requires: python-gtksourceview +# +# %description -n gitview +# Git graphical revision tree visualiser. +# +# %files -n gitview +# %doc contrib/gitview/gitview.txt +# %{_bindir}/gitview #---------------------------------------------------------------------------- @@ -287,7 +284,6 @@ 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 @@ -317,7 +313,7 @@ chmod -x contrib/mw-to-git/git-remote-mediawiki.perl mkdir -p %{buildroot}%{_datadir}/doc/git-core cp -ar contrib %{buildroot}%{_datadir}/doc/git-core # (cg) Even tho' we copy the whole contrib dir, copy this rather than symlink incase the user is excluding docs -install -m 755 contrib/gitview/gitview %{buildroot}%{_bindir} +# install -m 755 contrib/gitview/gitview %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_includedir}/git cp *.h %{buildroot}%{_includedir}/git @@ -341,10 +337,10 @@ cat > %{buildroot}%{_webappconfdir}/gitweb.conf < - Require all granted - Options ExecCgi - DirectoryIndex gitweb.cgi - AddHandler cgi-script .cgi + Require all granted + Options ExecCgi + DirectoryIndex gitweb.cgi + AddHandler cgi-script .cgi EOF @@ -361,9 +357,9 @@ EOF # install bash-completion file mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d install -m644 contrib/completion/git-completion.bash \ - %{buildroot}%{_sysconfdir}/bash_completion.d/git + %{buildroot}%{_sysconfdir}/bash_completion.d/git install -m644 contrib/completion/git-prompt.sh \ - %{buildroot}%{_sysconfdir}/bash_completion.d/git-prompt + %{buildroot}%{_sysconfdir}/bash_completion.d/git-prompt # And the prompt manipulation file install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/%{profile_branch}