summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2021-06-06 16:31:41 -0400
committerTodd Zullinger <tmz@pobox.com>2021-06-06 17:09:52 -0400
commit231b438d2d89edee4227417f87a7406fc4f91de4 (patch)
tree7cde182788028680df68760f4c304c5817ebd383
parent75e33a6155a26dcf6e65ee29a1186b7afd4d3bbc (diff)
downloadcgit_EL6-231b438d2d89edee4227417f87a7406fc4f91de4.tar.gz
use git to apply patches
With `git am` we're less likely to have issues like we saw with the patch command creating a .orig file while applying a patch with a small offset.
-rw-r--r--cgit.spec4
1 files changed, 3 insertions, 1 deletions
diff --git a/cgit.spec b/cgit.spec
index 3b8b0b1..cf2ea41 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -80,6 +80,7 @@ BuildRequires: asciidoc
BuildRequires: epel-rpm-macros
%endif
BuildRequires: gcc
+BuildRequires: git-core
BuildRequires: gnupg2
BuildRequires: libcurl-devel
BuildRequires: openssl-devel
@@ -117,7 +118,7 @@ Cgit is a fast web interface for git. It uses caching to increase performance.
xz -dc '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE90}' --signature='%{SOURCE92}' --data=-
xz -dc '%{SOURCE1}' | %{gpgverify} --keyring='%{SOURCE91}' --signature='%{SOURCE93}' --data=-
-%autosetup -a 1 -p1
+%autosetup -a 1 -S git
# setup the git dir
rm -rf git
@@ -222,6 +223,7 @@ make test
- remove %%_python_bytecompile_extra
- limit *.py[co] %%exclude to el7
- refresh highlight v3 patch
+- use git to apply patches
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild