From 44d8f34c75f7d4b97e2af8a210599b856774ffc21d5b59fa322af35a4c87b2a2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 6 Dec 2018 09:30:58 +0000 Subject: [PATCH] - Create a /var/cache/cgit [boo#1116567] OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=34 --- cgit-optflags.diff | 16 ---------------- cgit.changes | 7 +++++++ cgit.spec | 21 +++++++++++---------- git-2.18.0.tar.sign | Bin 566 -> 0 bytes git-2.18.0.tar.xz | 3 --- git-2.18.1.tar.sign | Bin 0 -> 566 bytes git-2.18.1.tar.xz | 3 +++ 7 files changed, 21 insertions(+), 29 deletions(-) delete mode 100644 cgit-optflags.diff delete mode 100644 git-2.18.0.tar.sign delete mode 100644 git-2.18.0.tar.xz create mode 100644 git-2.18.1.tar.sign create mode 100644 git-2.18.1.tar.xz diff --git a/cgit-optflags.diff b/cgit-optflags.diff deleted file mode 100644 index cad578b..0000000 --- a/cgit-optflags.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- - cgit.mk | 1 + - 1 file changed, 1 insertion(+) - -Index: cgit-0.11.2/cgit.mk -=================================================================== ---- cgit-0.11.2.orig/cgit.mk -+++ cgit-0.11.2/cgit.mk -@@ -17,6 +17,7 @@ $(CGIT_PREFIX)VERSION: force-version - - # CGIT_CFLAGS is a separate variable so that we can track it separately - # and avoid rebuilding all of Git when these variables change. -+CGIT_CFLAGS += $(RPM_OPT_FLAGS) - CGIT_CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"' - CGIT_CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"' - CGIT_CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"' diff --git a/cgit.changes b/cgit.changes index 817f17b..1151948 100644 --- a/cgit.changes +++ b/cgit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Dec 6 09:21:03 UTC 2018 - Jan Engelhardt + +- Create a /var/cache/cgit [boo#1116567] +- Update bundled git to 2.18.1 +- Remove cgit-optflags.diff + ------------------------------------------------------------------- Sun Aug 5 16:24:56 UTC 2018 - jengelh@inai.de diff --git a/cgit.spec b/cgit.spec index f01ac7a..b2484f7 100644 --- a/cgit.spec +++ b/cgit.spec @@ -16,7 +16,7 @@ # -%define git_version 2.18.0 +%define git_version 2.18.1 Name: cgit Version: 1.2.1 Release: 0 @@ -30,7 +30,6 @@ Source2: https://www.kernel.org/pub/software/scm/git/git-%git_version.tar Source3: https://www.kernel.org/pub/software/scm/git/git-%git_version.tar.sign Source4: %name.keyring Source9: cgitrc -Patch1: cgit-optflags.diff # Requirements for cgitrc man page generation BuildRequires: asciidoc # Requirements for cgit @@ -39,6 +38,7 @@ BuildRequires: libxslt BuildRequires: libzip-devel BuildRequires: xz BuildRoot: %_tmppath/%name-%version-build +Provides: bundled(git) = %version %description A web interface for the Git SCM, using a built-in cache to decrease server @@ -46,22 +46,22 @@ I/O pressure. %prep %setup -qa2 -%patch -P 1 -p1 rm -rf git ln -s git-%git_version git %build perl -i -pe 's{^#!/usr/bin/env }{#!/usr/bin/}g' filters/email-gravatar.py \ filters/html-converters/md2html filters/syntax-highlighting.py -make V=1 prefix="%_prefix" %{?_smp_mflags} +make V=1 prefix="%_prefix" CFLAGS="%optflags" %{?_smp_mflags} all %install -%make_install install-man 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/%_sysconfdir" -cp %SOURCE9 "%buildroot/%_sysconfdir/cgitrc" +%make_install V=1 prefix="%_prefix" CFLAGS="%optflags" \ + CGIT_SCRIPT_PATH="/srv/www/htdocs/cgit" install-man +b="%buildroot" +mkdir -p "$b/srv/www/cgi-bin/cgit/" "$b/var/cache/cgit" +mv $b/srv/www/htdocs/cgit/cgit.cgi $b/srv/www/cgi-bin/cgit/cgit.cgi +mkdir -p "$b/%_sysconfdir" +cp "%_sourcedir/cgitrc" "$b/%_sysconfdir/" %files %defattr(-,root,root) @@ -70,6 +70,7 @@ cp %SOURCE9 "%buildroot/%_sysconfdir/cgitrc" /srv/www/cgi-bin/cgit/ /srv/www/htdocs/cgit/ %_prefix/lib/cgit/ +%attr(0750,wwwrun,www) /var/cache/cgit/ %config(noreplace) %_sysconfdir/cgitrc %changelog diff --git a/git-2.18.0.tar.sign b/git-2.18.0.tar.sign deleted file mode 100644 index d51b1f91f83392026846f779cd947d3ac0af4afec2a49cef4c09fc0820dabaca..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c#RXG;yl^AWE?-{9)^aTAxa`z6MJ!_WoVuVQq^oBhA^%c3 zRy%(z*mLe?&BK90=1-o)I8bdPTw9ImQSV~!8?l9a2+i6uYGq!hcB?7lg*XvXQ_f)3 z`@{>oz4J{lmV<;P2yn&V?P5dSmd>dbG*~`6R+gt3?UtASL!Aur*vGxu_iPGY2nSSI zFy<8fCC&G1FLZlsPbpwC-*8XlFd=46T*&O4`Z}DeMiugc9GOL>v)s{eET+y~J@vmR zUtQ1Xztvp)w*3%ZM;f@Azj)uJ&<_R`kt~IK?RGe#HZN5UZ+X`Fd5=lzQiMDSW#N)3 z^mIcijF_(AMJ%%13aC5A0r|%+%N6O;SwR|rYiR;VW->o^VNTtR?>+{J@g&>*)ChPQ zn4@`LWUy10Y&nCjn<_LS-{1rFIk+{)^kagGKbny*?Uw~nC7S;eEM>0I z4=pp_Jxyi~fCLn2@gjN+o=UHm%TF4)s9=4>#TI8&Am4I#PZRzP2BG6y@)?S*!fM<4 E!2l5zwg3PC diff --git a/git-2.18.0.tar.xz b/git-2.18.0.tar.xz deleted file mode 100644 index cac1dc7..0000000 --- a/git-2.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92 -size 5102264 diff --git a/git-2.18.1.tar.sign b/git-2.18.1.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..8686e4ca3b25bbf6411b3576f255a80b78ced36292a7bfb465e42cd2d8f2006e GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cy6IF)lyX7J)X4 zFY$rUETQ!aZ|v(cR{&QmrNpR&?yw23pIK;lnvb4U7)abZ0@py)*bJJL#0c%sINg$G zRXWsNiV`HU_`wcx>fLImd9SgcvhY}M?3G^waIFPe$v2%-viK^?;320&4MH{$W`5j< z1Y#3ct30R%D1vOb355ldGua4uQ4=azVylG*ekDOTuTX5xU!WIER z#P$Emil!WEb!eX-N#L7;nEd!V>M?z$Fu^9d|GU(&RR|iK6(j%An-L(h4Z3&gE^m(H ziJJK%a>o_~wh4UaYU~Q`wgHXPYs%&+aZg9Q_cyX~lZXN#rp$r?fo#&P@^R;Jo2N?k)q2G6DZ}5W)&GZ*4f-IbW*@&eA)XR454HsUK$bcOuUK z<0#~u^3_Q93teH|(eQ{d*BeI%qJk`jYTk8>=i)_Z3p`oei-g34yRRW{v6KEDE3E-+u z43<2w?mglH{E)v2vM)i4{9p_1$HvddoZ12xQW2g1IIp84Gw*c(&2iZ#iVY^@gz;2r ENn^JdhyVZp literal 0 HcmV?d00001 diff --git a/git-2.18.1.tar.xz b/git-2.18.1.tar.xz new file mode 100644 index 0000000..081e0d9 --- /dev/null +++ b/git-2.18.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:888504a45cb70a002258374b3add9b5cdc044c35edd5976ab8bbeec4800898b6 +size 5102812