Package: git-buildpackage-rpm
Version: 0.8.7
Severity: minor

Dear Maintainer,

I'm not sure yet as of which version, but the %patch macro of rpm
supports the flag -F<num>, which seems to be similar to that of
patch(1): allow patches with a specific fuzz.

If the spec has the line '%patch0 -p1 -F2', you would get the following
error:

  Usage: gbp [options]
  
  gbp: error: no such option: -F

Which is also rather confusing and gives no good indication where to
look for the issue.

Workaround:

diff --git a/gbp/rpm/__init__.py b/gbp/rpm/__init__.py
index 2d37cca..0509bdc 100644
--- a/gbp/rpm/__init__.py
+++ b/gbp/rpm/__init__.py
@@ -326,6 +326,7 @@ class SpecFile(object):
         patchparser.add_option("-P", dest="patchnum")
         patchparser.add_option("-b", dest="backup")
         patchparser.add_option("-E", dest="removeempty")
+        patchparser.add_option("-F", dest="fuzz")
         arglist = args.split()
         return patchparser.parse_args(arglist)[0]
 

-- System Information:
Debian Release: stretch/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: armhf

Kernel: Linux 4.8.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=he_IL.UTF-8, LC_CTYPE=he_IL.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages git-buildpackage-rpm depends on:
ii  cpio              2.11+dfsg-5
ii  git-buildpackage  0.8.7
ii  python-rpm        4.12.0.2+dfsg1-1
pn  python:any        <none>
ii  rpm               4.12.0.2+dfsg1-1

Versions of packages git-buildpackage-rpm recommends:
ii  pristine-tar  1.37

Versions of packages git-buildpackage-rpm suggests:
ii  mock           1.2.18-1
ii  python-notify  0.1.1-4
ii  unzip          6.0-20
ii  zipmerge       1.1.2-1.1

-- no debconf information

Reply via email to