[packages/curl] - added config patch to avoid errors when running `curl-config --cflags`

qboosh qboosh at pld-linux.org
Thu Oct 4 21:01:09 CEST 2012


commit cb26134f91ceb04682bddf1b6e621d1f9710fb6c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Oct 4 21:02:35 2012 +0200

    - added config patch to avoid errors when running `curl-config --cflags`

 curl-config.patch | 14 ++++++++++++++
 curl.spec         |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)
---
diff --git a/curl.spec b/curl.spec
index 9c953f8..bc8aae5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -22,7 +22,7 @@ Summary(ru.UTF-8):	Утилита для получения файлов с се
 Summary(uk.UTF-8):	Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:		curl
 Version:	7.27.0
-Release:	1
+Release:	2
 License:	MIT-like
 Group:		Applications/Networking
 Source0:	http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -33,6 +33,7 @@ Patch3:		%{name}-krb5flags.patch
 Patch4:		lib%{name}.fb-changes.diff
 Patch5:		gnutls3.patch
 Patch6:		%{name}-gtls.patch
+Patch7:		%{name}-config.patch
 URL:		http://curl.haxx.se/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -200,6 +201,7 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__rm} -v m4/lt*.m4 m4/libtool.m4
 
diff --git a/curl-config.patch b/curl-config.patch
new file mode 100644
index 0000000..d5dd6e7
--- /dev/null
+++ b/curl-config.patch
@@ -0,0 +1,14 @@
+--- curl-7.27.0/curl-config.in.orig	2012-05-25 23:56:17.000000000 +0200
++++ curl-7.27.0/curl-config.in	2012-10-04 20:50:06.753669995 +0200
+@@ -135,9 +135,9 @@
+           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
+        	;;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/cb26134f91ceb04682bddf1b6e621d1f9710fb6c



More information about the pld-cvs-commit mailing list