Jan Engelhardt 2017-02-11 18:06:59 +00:00 committed by Git OBS Bridge
parent dd71560c19
commit 79cf7595e4
6 changed files with 24 additions and 19 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Feb 11 17:56:42 UTC 2017 - jengelh@inai.de
- Update bundled git to 2.11.1
-------------------------------------------------------------------
Thu Jan 19 15:20:32 UTC 2017 - vsvecova@suse.com

View File

@ -16,7 +16,7 @@
#
%define git_version 2.11.0
%define git_version 2.11.1
Name: cgit
Version: 1.1
Release: 0
@ -25,10 +25,10 @@ License: GPL-2.0
Group: Development/Tools/Version Control
Url: http://git.zx2c4.com/cgit/
#Git-Clone: https://git.zx2c4.com/cgit
Source: https://git.zx2c4.com/cgit/snapshot/%{name}-%{version}.tar.xz
Source2: https://www.kernel.org/pub/software/scm/git/git-%{git_version}.tar.xz
Source3: https://www.kernel.org/pub/software/scm/git/git-%{git_version}.tar.sign
Source4: %{name}.keyring
Source: https://git.zx2c4.com/cgit/snapshot/%name-%version.tar.xz
Source2: https://www.kernel.org/pub/software/scm/git/git-%git_version.tar.xz
Source3: https://www.kernel.org/pub/software/scm/git/git-%git_version.tar.sign
Source4: %name.keyring
Source9: cgitrc
Patch0: cgit-optflags.diff
Patch1: cgit-built-with-git-v2.11.0.patch
@ -39,7 +39,7 @@ BuildRequires: libopenssl-devel
BuildRequires: libxslt
BuildRequires: libzip-devel
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRoot: %_tmppath/%name-%version-build
%description
This is an attempt to create a fast web interface for the Git SCM, using a
@ -50,28 +50,28 @@ builtin cache to decrease server I/O pressure.
%patch0 -p1
%patch1 -p1
rm -rf git
ln -s git-%{git_version} git
ln -s git-%git_version git
%build
make V=1 prefix="%{_prefix}" %{?_smp_mflags}
make V=1 prefix="%_prefix" %{?_smp_mflags}
%install
make install install-man DESTDIR=%{buildroot} prefix="%{_prefix}" \
make install install-man DESTDIR=%buildroot prefix="%_prefix" \
CGIT_SCRIPT_PATH="/srv/www/htdocs/cgit"
mkdir -p "%{buildroot}/srv/www/cgi-bin/cgit/"
mv %{buildroot}/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
mkdir -p "%buildroot/srv/www/cgi-bin/cgit/"
mv %buildroot/srv/www/{htdocs,cgi-bin}/cgit/cgit.cgi
mkdir -p "%{buildroot}/%{_sysconfdir}"
cp %{SOURCE9} "%{buildroot}/%{_sysconfdir}/cgitrc"
mkdir -p "%buildroot/%_sysconfdir"
cp %SOURCE9 "%buildroot/%_sysconfdir/cgitrc"
%files
%defattr(-,root,root)
%doc README COPYING
%{_mandir}/man5/cgitrc.5%{ext_man}
%_mandir/man5/cgitrc.5%ext_man
/srv/www/cgi-bin/cgit/
/srv/www/htdocs/cgit/
%{_prefix}/lib/cgit/
%config(noreplace) %{_sysconfdir}/cgitrc
%_prefix/lib/cgit/
%config(noreplace) %_sysconfdir/cgitrc
%changelog

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b
size 4197984

BIN
git-2.11.1.tar.sign Normal file

Binary file not shown.

3
git-2.11.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415
size 4208132