[curl/f18] fix a syntax error in curl-config (#871317)
Kamil Dudka
kdudka at fedoraproject.org
Wed Oct 31 13:40:11 UTC 2012
commit 15e61c15ec3b8647fdadda928d9e64626eeb4b1e
Author: Kamil Dudka <kdudka at redhat.com>
Date: Wed Oct 31 14:37:31 2012 +0100
fix a syntax error in curl-config (#871317)
0003-curl-7.27.0-382429e7.patch | 32 ++++++++++++++++++++++++++++++++
curl.spec | 9 ++++++++-
2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/0003-curl-7.27.0-382429e7.patch b/0003-curl-7.27.0-382429e7.patch
new file mode 100644
index 0000000..f25fe71
--- /dev/null
+++ b/0003-curl-7.27.0-382429e7.patch
@@ -0,0 +1,32 @@
+From 382429e7601de68564f08a88cc867dbcd6e2556a Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel at haxx.se>
+Date: Tue, 7 Aug 2012 14:13:09 +0200
+Subject: [PATCH] curl-config: parentheses fix
+
+Braces, not parentheses, should be used for shell variable names.
+
+Bug: http://curl.haxx.se/bug/view.cgi?id=3551460
+Reported by: Edward Sheldrake
+---
+ curl-config.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/curl-config.in b/curl-config.in
+index a3ca8b5..731761c 100644
+--- a/curl-config.in
++++ b/curl-config.in
+@@ -135,9 +135,9 @@ while test $# -gt 0; do
+ CPPFLAG_CURL_STATICLIB=""
+ fi
+ if test "X at includedir@" = "X/usr/include"; then
+- echo "$(CPPFLAG_CURL_STATICLIB)"
++ echo "$CPPFLAG_CURL_STATICLIB"
+ else
+- echo "$(CPPFLAG_CURL_STATICLIB)-I at includedir@"
++ echo "${CPPFLAG_CURL_STATICLIB}-I at includedir@"
+ fi
+ ;;
+
+--
+1.7.1
+
diff --git a/curl.spec b/curl.spec
index abfe50e..d7530d5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,7 +1,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 7.27.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -14,6 +14,9 @@ Patch1: 0001-curl-7.27.0-1f8518c5.patch
# do not crash if MD5 fingerprint is not provided by libssh2
Patch2: 0002-curl-7.27.0-f05e5136.patch
+# fix a syntax error in curl-config (#871317)
+Patch3: 0003-curl-7.27.0-382429e7.patch
+
# patch making libcurl multilib ready
Patch101: 0101-curl-7.27.0-multilib.patch
@@ -109,6 +112,7 @@ documentation of the library, too.
# upstream patches
%patch1 -p1
%patch2 -p1
+%patch3 -p1
# Fedora patches
%patch101 -p1
@@ -232,6 +236,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Wed Oct 31 2012 Kamil Dudka <kdudka at redhat.com> 7.27.0-4
+- fix a syntax error in curl-config (#871317)
+
* Mon Oct 01 2012 Kamil Dudka <kdudka at redhat.com> 7.27.0-3
- use the upstream facility to disable problematic tests
- do not crash if MD5 fingerprint is not provided by libssh2
More information about the scm-commits
mailing list