From dd71560c195724f3763c1b92ef56ab8cad2b96fd5cbb9146e995999ff46c5744 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 20 Jan 2017 10:18:37 +0000 Subject: [PATCH] Accepting request 451575 from home:vsvecova:branches:devel:tools:scm - 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 OBS-URL: https://build.opensuse.org/request/show/451575 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=30 --- cgit-1.0.tar.xz | 3 -- cgit-1.1.tar.xz | 3 ++ cgit-built-with-git-v2.11.0.patch | 27 +++++++++++++++++ cgit.changes | 22 +++++++++----- cgit.spec | 48 +++++++++++++++--------------- git-2.11.0.tar.sign | Bin 0 -> 543 bytes git-2.11.0.tar.xz | 3 ++ git-2.8.3.tar.sign | Bin 543 -> 0 bytes git-2.8.3.tar.xz | 3 -- 9 files changed, 72 insertions(+), 37 deletions(-) delete mode 100644 cgit-1.0.tar.xz create mode 100644 cgit-1.1.tar.xz create mode 100644 cgit-built-with-git-v2.11.0.patch create mode 100644 git-2.11.0.tar.sign create mode 100644 git-2.11.0.tar.xz delete mode 100644 git-2.8.3.tar.sign delete mode 100644 git-2.8.3.tar.xz diff --git a/cgit-1.0.tar.xz b/cgit-1.0.tar.xz deleted file mode 100644 index d960f93..0000000 --- a/cgit-1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a89754610922f122468c791888ed6309a81fa0f3ae948d118284b673cb40704d -size 85924 diff --git a/cgit-1.1.tar.xz b/cgit-1.1.tar.xz new file mode 100644 index 0000000..ec94151 --- /dev/null +++ b/cgit-1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 +size 86268 diff --git a/cgit-built-with-git-v2.11.0.patch b/cgit-built-with-git-v2.11.0.patch new file mode 100644 index 0000000..01a2309 --- /dev/null +++ b/cgit-built-with-git-v2.11.0.patch @@ -0,0 +1,27 @@ +From 91153fd02e62f2eaca8e6c140baa4f2abf39c40e Mon Sep 17 00:00:00 2001 +From: Christian Hesse +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 diff --git a/cgit.changes b/cgit.changes index 370cc7a..b9fd65b 100644 --- a/cgit.changes +++ b/cgit.changes @@ -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 diff --git a/cgit.spec b/cgit.spec index 02fff43..bfb9443 100644 --- a/cgit.spec +++ b/cgit.spec @@ -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 diff --git a/git-2.11.0.tar.sign b/git-2.11.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..38c11fb58df7949680591872bf21436eb36fbf716968f97ef21f0fbdf3bd2dd8 GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-(-?l}Mo2@tTg=!TZB=F6@r5B@6FB4v_vd7h2lv*15p zv$NV*YZ3vp!bqpiJNtxUwVJJHs&=U<+K@>(5u7*G|9q|_iKRPON=1DfF@-06Hy{Vg z4I%|p%0EXNNP)aDzPylpsqgPbt+>=Z; zLXhf@1fL#-6MNgsl*QT;VWTtp+&`(HL?33+mZ{;zy^7JPBNlfNxNzciO%8yAU`o$+ z5)vzkc7|YM;5YitUdj*IjibR<>y(-+YkFLu1$_#Oh{#=N%)YM^wjLKeepPo(o0JMb z%&)bIa(_2)q@6m*Urd|pO@h{4f*uhZ0TnzLMj4X})o71X-*8b@z=F&*wtK{^?6uSh z6_W0|LM48y&F8GPqCPC)==1KXq`KA;{*)|R#7~|PTsY^!iG`x9VWd*kOhdXV1fTf` zgfm&;)pJSApO>P|<8Q4IUOO^`LL3TX%_rw4qRJNj&VIidS@ZDSy+b8vqkJ3ix&2z? z;cR6^FOe|G$vO~f{-ySu>}hPs54?8Kc0%g4MPt|M5X? zf8@5goO}l@f=DnhhsAb{)?`jjX4(BF5g^a-Q*77cZPfLxfT=^c$16BYOkSi2gvh(_ zG*z-!e-Bs|YJ54Ajf3?yUsz?Lmm35Qk+?c->Bz2&lm{GR1Ohy&2-5LzIiN=idXX1w zXr(&V#{9Hn5Q_td>!pd);z98h)g83AjO&W{w`OjpyR?u+6?@yl8#Xh;v-q4N@Mkh3 z*{Mq_;6us@ZwMHOkK8h@LjgsFJwi@3a-l$&dYum!ITu%Vg z#&9>{4(!mjTX%OVSs@ZX&#Go~0_e#Pf=21ILWKO$1;QS+P4gHpme`G@J9S6~9g=>w z#jkH-*Gh$Cuyjtse>jT+A9|_JmFf{v?WEazbrxgP`@jw31erP{j zs^bhLKr7RFhxrL0e{bH7^*P*n3;F5cEh$F*&VweQY3_P2NJnJ#nlifr7?Q h(eaJj5sHJaLJNkN`Hyi7InA03(C}MyP!~5U&MN><0|Ed5 diff --git a/git-2.8.3.tar.xz b/git-2.8.3.tar.xz deleted file mode 100644 index d78ee72..0000000 --- a/git-2.8.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d8e6c274a88b4a73b3c98c70d3438ec12871300ce8bb4ca179ea19fcf74aa91 -size 3979536