pool/cgit
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 451579 from devel:tools:scm

Browse Source 
- Version bump to v1.1:
  * For more information see complete changelog at
    https://git.zx2c4.com/cgit/log/
- Add cgit-built-with-git-v2.11.0.patch

  * More gracefully deal with unparsable commits.
- BuildRequire xz
    There are more incorrect invocations of read_tree_recursive(),
    one example can be seen when visiting one of the 'plain' links
    This time I did what I should have done last time and checked
- Initial release, version 0.8.3.1 (forwarded request 451575 from vsvecova)

OBS-URL: https://build.opensuse.org/request/show/451579
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cgit?expand=0&rev=29
This commit is contained in:
Dominique Leuenberger 2017-01-24 09:37:03 +00:00 committed by Git OBS Bridge
commit 13df7e3b5a
9 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cgit-1.0.tar.xz
View File

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

3
cgit-1.1.tar.xz Normal file
View File

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

27
cgit-built-with-git-v2.11.0.patch Normal file
View File

@ -0,0 +1,27 @@
From 91153fd02e62f2eaca8e6c140baa4f2abf39c40e Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 30 Nov 2016 10:43:08 +0100
Subject: git: update to v2.11.0
Update to git version v2.11.0. Function write_archive()
dropped argument (int setup_prefix).
---
ui-snapshot.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 08c6e80..9b8cddd 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -37,7 +37,7 @@ static int write_archive_type(const char *format, const char *hex, const char *p
/* argv_array guarantees a trailing NULL entry. */
memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
- result = write_archive(argv.argc, nargv, NULL, 1, NULL, 0);
+ result = write_archive(argv.argc, nargv, NULL, NULL, 0);
argv_array_clear(&argv);
free(nargv);
return result;
--
cgit v1.1-3-g9641

22
cgit.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 19 15:20:32 UTC 2017 - vsvecova@suse.com
- Version bump to v1.1:
* For more information see complete changelog at
https://git.zx2c4.com/cgit/log/
- Add cgit-built-with-git-v2.11.0.patch
-------------------------------------------------------------------
Thu Jan 5 16:20:44 UTC 2017 - vcizek@suse.com
@ -21,7 +29,7 @@ Mon Jun 13 22:29:05 UTC 2016 - astieger@suse.com
* Unicode issues in syntax highlighting.
* Account for caches with empty key.
* Use size_t for all lengths.
* More gracefully deal with unparsable commits.
* More gracefully deal with unparsable commits.
- with git 2.8.3
- the following patches are now included upstream git 2.8.3:
0012-http-push-stop-using-name_path.patch
@ -125,7 +133,7 @@ Fri Jul 5 17:05:04 CEST 2013 - tiwai@suse.de
-------------------------------------------------------------------
Tue Nov 20 13:51:05 UTC 2012 - vjt@openssl.it
- BuildRequire xz
- BuildRequire xz
-------------------------------------------------------------------
Tue Nov 20 12:04:15 CET 2012 - tiwai@suse.de
@ -184,11 +192,11 @@ Mon Nov 28 14:04:00 CET 2011 - zooey@hirschkaefer.de
- Add patch cgit-fix-more-read_tree_recursive-invocations.diff:
There are more incorrect invocations of read_tree_recursive(),
one example can be seen when visiting one of the 'plain' links
There are more incorrect invocations of read_tree_recursive(),
one example can be seen when visiting one of the 'plain' links
in the tree view (contents of the wrong file are shown).
This time I did what I should have done last time and checked
This time I did what I should have done last time and checked
and adjusted all invocations of read_tree_recursive().
-------------------------------------------------------------------
@ -325,4 +333,4 @@ Sun Apr 25 18:29:34 UTC 2010 - poletti.marco@gmail.com
-------------------------------------------------------------------
Fri Feb 5 16:37:58 UTC 2010 - poletti.marco@gmail.com
- Initial release, version 0.8.3.1
- Initial release, version 0.8.3.1

48
cgit.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package cgit
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,62 +16,62 @@
#
%define git_version 2.8.3
%define git_version 2.11.0
Name: cgit
Version: 1.0
Version: 1.1
Release: 0
Summary: A web frontend for git repositories
Url: http://git.zx2c4.com/cgit/
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
# Requirements for cgit
BuildRequires: libopenssl-devel
BuildRequires: libzip-devel
Patch1: cgit-built-with-git-v2.11.0.patch
# Requirements for cgitrc man page generation
BuildRequires: asciidoc
# Requirements for cgit
BuildRequires: libopenssl-devel
BuildRequires: libxslt
BuildRequires: libzip-devel
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This is an attempt to create a fast web interface for the Git SCM, using a
builtin cache to decrease server I/O pressue.
builtin cache to decrease server I/O pressure.
%prep
%setup -qa2
%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.gz
%{_mandir}/man5/cgitrc.5%{ext_man}
/srv/www/cgi-bin/cgit/
/srv/www/htdocs/cgit/
/usr/lib/cgit/
%config(noreplace) %_sysconfdir/cgitrc
%{_prefix}/lib/cgit/
%config(noreplace) %{_sysconfdir}/cgitrc
%changelog

BIN
git-2.11.0.tar.sign Normal file
View File

Binary file not shown.

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

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

BIN
git-2.8.3.tar.sign
View File

Binary file not shown.

3
git-2.8.3.tar.xz
View File

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