From 72682a3dedc8cb82ecdde21ed1b9b2964b194eee Mon Sep 17 00:00:00 2001 From: Konstantin Vlasov Date: Thu, 12 Mar 2015 16:48:12 +0300 Subject: [PATCH] Updated to latest upstream 2.3.2 1. Removed python-git: unsupported by git since 1.8.5. --- .abf.yml | 4 +++- git.spec | 27 ++++++++------------------- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/.abf.yml b/.abf.yml index d0c27e2..ec08f0d 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,4 @@ +removed_sources: + git-1.7.11.3.tar.gz: a10c420e4d9152d6059f41825904cfac3062b135 sources: - "git-1.7.11.3.tar.gz": a10c420e4d9152d6059f41825904cfac3062b135 + git-2.3.2.tar.xz: c7b0550c34109752bd25c4cd2007908df689b603 diff --git a/git.spec b/git.spec index 20dc9da..734463f 100644 --- a/git.spec +++ b/git.spec @@ -1,16 +1,16 @@ -%define devname %mklibname git -a +%define devname %mklibname git -d %define profile_branch 93git-branch.sh %define profile_env 93git-env.sh Summary: Global Information Tracker Name: git -Version: 1.7.11.3 -Release: 8 +Version: 2.3.2 +Release: 1 Epoch: 1 License: GPLv2+ Group: Development/Tools Url: http://git-scm.com/ -Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz +Source0: https://www.kernel.org/pub/software/scm/git/%{name}-%{version}.tar.xz Source2: gitweb.conf Source3: %{profile_branch} # Do we really need it? It's not used anyway @@ -23,7 +23,6 @@ BuildRequires: perl-devel BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(zlib) Requires: git-core = %{EVRD} Requires: gitk = %{EVRD} @@ -32,6 +31,7 @@ Requires: git-email = %{EVRD} Suggests: git-arch = %{EVRD} Suggests: git-core-oldies = %{EVRD} Suggests: git-cvs = %{EVRD} +Obsoletes: python-git %description This is a stupid (but extremely fast) directory content manager. It @@ -95,8 +95,10 @@ repositories from other VCS. %{_mandir}/*/gitcli* %{_mandir}/*/githooks* %{_mandir}/*/gitrepository* +%{_mandir}/*/gitremote-helpers* %{_mandir}/*/*tutorial* %{_mandir}/*/*glossary* +%{_mandir}/*/giteveryday* %{_mandir}/*/gitdiffcore* %{_mandir}/*/gitworkflows* %{_mandir}/*/gitrevisions* @@ -237,19 +239,6 @@ Perl interface to Git #---------------------------------------------------------------------------- -%package -n python-git -Summary: Python interface to Git -Group: Development/Python -Requires: git-core = %{EVRD} - -%description -n python-git -Python interface to Git - -%files -n python-git -%{py_puresitedir}/* - -#---------------------------------------------------------------------------- - %package -n git-core-oldies Summary: Git obsolete commands, bound to extinction Group: Development/Other @@ -320,7 +309,7 @@ mkdir -p %{buildroot}%{_bindir} make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} # Avoid dependencies on obscure perl modules -chmod -x contrib/mw-to-git/git-remote-mediawiki +chmod -x contrib/mw-to-git/git-remote-mediawiki.perl # (cg) Copy the whole contrib dir as docs. It contains useful scripts. mkdir -p %{buildroot}%{_datadir}/doc/git-core