Djam/git
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/git.git synced 2025-02-23 09:43:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to latest upstream 2.3.2

Browse source 
1. Removed python-git: unsupported by git since 1.8.5.
This commit is contained in:
Konstantin Vlasov 2015-03-12 16:48:12 +03:00
parent 11cbc798e6
commit 72682a3ded
2 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,2 +1,4 @@
removed_sources:
git-1.7.11.3.tar.gz: a10c420e4d9152d6059f41825904cfac3062b135
sources: sources:
"git-1.7.11.3.tar.gz": a10c420e4d9152d6059f41825904cfac3062b135 git-2.3.2.tar.xz: c7b0550c34109752bd25c4cd2007908df689b603

27
git.spec
View file

@ -1,16 +1,16 @@
%define devname %mklibname git -a %define devname %mklibname git -d
%define profile_branch 93git-branch.sh %define profile_branch 93git-branch.sh
%define profile_env 93git-env.sh %define profile_env 93git-env.sh
Summary: Global Information Tracker Summary: Global Information Tracker
Name: git Name: git
Version: 1.7.11.3 Version: 2.3.2
Release: 8 Release: 1
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: Development/Tools Group: Development/Tools
Url: http://git-scm.com/ 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 Source2: gitweb.conf
Source3: %{profile_branch} Source3: %{profile_branch}
# Do we really need it? It's not used anyway # Do we really need it? It's not used anyway
@ -23,7 +23,6 @@ BuildRequires: perl-devel
BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Requires: git-core = %{EVRD} Requires: git-core = %{EVRD}
Requires: gitk = %{EVRD} Requires: gitk = %{EVRD}
@ -32,6 +31,7 @@ Requires: git-email = %{EVRD}
Suggests: git-arch = %{EVRD} Suggests: git-arch = %{EVRD}
Suggests: git-core-oldies = %{EVRD} Suggests: git-core-oldies = %{EVRD}
Suggests: git-cvs = %{EVRD} Suggests: git-cvs = %{EVRD}
Obsoletes: python-git
%description %description
This is a stupid (but extremely fast) directory content manager. It This is a stupid (but extremely fast) directory content manager. It
@ -95,8 +95,10 @@ repositories from other VCS.
%{_mandir}/*/gitcli* %{_mandir}/*/gitcli*
%{_mandir}/*/githooks* %{_mandir}/*/githooks*
%{_mandir}/*/gitrepository* %{_mandir}/*/gitrepository*
%{_mandir}/*/gitremote-helpers*
%{_mandir}/*/*tutorial* %{_mandir}/*/*tutorial*
%{_mandir}/*/*glossary* %{_mandir}/*/*glossary*
%{_mandir}/*/giteveryday*
%{_mandir}/*/gitdiffcore* %{_mandir}/*/gitdiffcore*
%{_mandir}/*/gitworkflows* %{_mandir}/*/gitworkflows*
%{_mandir}/*/gitrevisions* %{_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 %package -n git-core-oldies
Summary: Git obsolete commands, bound to extinction Summary: Git obsolete commands, bound to extinction
Group: Development/Other Group: Development/Other
@ -320,7 +309,7 @@ mkdir -p %{buildroot}%{_bindir}
make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot} make install-doc prefix=%{_prefix} gitexecdir=%{_libdir}/git-core DESTDIR=%{buildroot}
# Avoid dependencies on obscure perl modules # 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. # (cg) Copy the whole contrib dir as docs. It contains useful scripts.
mkdir -p %{buildroot}%{_datadir}/doc/git-core mkdir -p %{buildroot}%{_datadir}/doc/git-core