From 8eae4647c316593330fe56022236557df9048b42 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Tue, 15 Aug 2017 12:34:08 +0200
Subject: [PATCH] make zsh completion work again

---
 0001-curl-7.55.1-zsh-completion.patch | 67 +++++++++++++++++++++++++++
 curl.spec                             |  9 +++-
 2 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 0001-curl-7.55.1-zsh-completion.patch

diff --git a/0001-curl-7.55.1-zsh-completion.patch b/0001-curl-7.55.1-zsh-completion.patch
new file mode 100644
index 0000000..8a37cd4
--- /dev/null
+++ b/0001-curl-7.55.1-zsh-completion.patch
@@ -0,0 +1,67 @@
+From 918eb4c10b60a58ea6b14bea7b9fbfba4d29598c Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 14 Aug 2017 16:13:32 +0200
+Subject: [PATCH] zsh.pl: produce a working completion script again
+
+Commit curl-7_54_0-118-g8b2f22e changed the output format of curl --help
+to use <file> and <dir> instead of FILE and DIR, which caused zsh.pl to
+produce a broken completion script:
+
+% curl --<TAB>
+_curl:10: no such file or directory: seconds
+
+Closes #1779
+
+Upstream-commit: ab2a7079cd2a1ec279b1e6b587ba48e50c155e91
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ docs/cmdline-opts/cacert.d | 2 +-
+ scripts/zsh.pl             | 5 +++--
+ src/tool_help.c            | 2 +-
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/docs/cmdline-opts/cacert.d b/docs/cmdline-opts/cacert.d
+index 04e1139..b2ecf90 100644
+--- a/docs/cmdline-opts/cacert.d
++++ b/docs/cmdline-opts/cacert.d
+@@ -1,5 +1,5 @@
+ Long: cacert
+-Arg: <CA certificate>
++Arg: <file>
+ Help: CA certificate to verify peer against
+ Protocols: TLS
+ ---
+diff --git a/scripts/zsh.pl b/scripts/zsh.pl
+index f0d8c19..82b4d9f 100755
+--- a/scripts/zsh.pl
++++ b/scripts/zsh.pl
+@@ -54,10 +54,11 @@ sub parse_main_opts {
+         $option .= '}' if defined $short;
+         $option .= '\'[' . trim($desc) . ']\'' if defined $desc;
+ 
+-        $option .= ":$arg" if defined $arg;
++        $option .= ":'$arg'" if defined $arg;
+ 
+         $option .= ':_files'
+-            if defined $arg and ($arg eq 'FILE' || $arg eq 'DIR');
++            if defined $arg and ($arg eq '<file>' || $arg eq '<filename>'
++                || $arg eq '<dir>');
+ 
+         push @list, $option;
+     }
+diff --git a/src/tool_help.c b/src/tool_help.c
+index 42dc779..a5bfaba 100644
+--- a/src/tool_help.c
++++ b/src/tool_help.c
+@@ -54,7 +54,7 @@ static const struct helptxt helptext[] = {
+    "Append to target file when uploading"},
+   {"    --basic",
+    "Use HTTP Basic Authentication"},
+-  {"    --cacert <CA certificate>",
++  {"    --cacert <file>",
+    "CA certificate to verify peer against"},
+   {"    --capath <dir>",
+    "CA directory to verify peer against"},
+-- 
+2.9.5
+
diff --git a/curl.spec b/curl.spec
index 78aff99..076a723 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,11 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.55.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
+# make zsh completion work again
+Patch1:   0001-curl-7.55.1-zsh-completion.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -149,6 +152,7 @@ be installed.
 %setup -q
 
 # upstream patches
+%patch1 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -302,6 +306,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.[0-9].[0-9].[0-9].minimal
 
 %changelog
+* Tue Aug 15 2017 Kamil Dudka <kdudka@redhat.com> 7.55.1-2
+- make zsh completion work again
+
 * Mon Aug 14 2017 Kamil Dudka <kdudka@redhat.com> 7.55.1-1
 - new upstream release