From 79cf7595e487339a1e5c6086e929b40c9cffbcb9265853c6ad1828c452a3755b Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 11 Feb 2017 18:06:59 +0000 Subject: [PATCH] +git-2.11.1 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/cgit?expand=0&rev=31 --- cgit.changes | 5 +++++ cgit.spec | 32 ++++++++++++++++---------------- git-2.11.0.tar.sign | Bin 543 -> 0 bytes git-2.11.0.tar.xz | 3 --- git-2.11.1.tar.sign | Bin 0 -> 543 bytes git-2.11.1.tar.xz | 3 +++ 6 files changed, 24 insertions(+), 19 deletions(-) delete mode 100644 git-2.11.0.tar.sign delete mode 100644 git-2.11.0.tar.xz create mode 100644 git-2.11.1.tar.sign create mode 100644 git-2.11.1.tar.xz diff --git a/cgit.changes b/cgit.changes index b9fd65b..c7dd6ee 100644 --- a/cgit.changes +++ b/cgit.changes @@ -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 diff --git a/cgit.spec b/cgit.spec index bfb9443..383589a 100644 --- a/cgit.spec +++ b/cgit.spec @@ -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 diff --git a/git-2.11.0.tar.sign b/git-2.11.0.tar.sign deleted file mode 100644 index 38c11fb58df7949680591872bf21436eb36fbf716968f97ef21f0fbdf3bd2dd8..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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%g4MD+v-cnD^fc=(DR~Sj^b^v1jcwe5oU|iUsn@5=P{uQ+x?CsvIs8XLwZ~=kzY;}&A!^{JES(3INSgsa^{<2&vw6mM&;%EK^f$ZDdmpC1)s2v7HxRgxjf2Jf zJq5~)kz6^inNL*eS`u;!<*1@p{RFfH+8Btw(#+EBl4dbao<8UP#}$s1fAkXrinSYCrwj*Ow6G|0>n(NH_u^#&APa z?1hFQQ}!LOt$Zs(=ksY*gYF8l^%)Zii2<~9Z_Z+{H@)^y5w61bRl=C5Tnira8yv`!byezlzczM4IlBbajaDE1KPR-aM2tNP- literal 0 HcmV?d00001 diff --git a/git-2.11.1.tar.xz b/git-2.11.1.tar.xz new file mode 100644 index 0000000..6607692 --- /dev/null +++ b/git-2.11.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 +size 4208132