[libofa] fix build failure against curl >= 7.21
Than Ngo
than at fedoraproject.org
Thu Dec 1 21:31:41 UTC 2011
commit f7be73b6e566175de888d07bf340131579c00064
Author: Than Ngo <than at redhat.com>
Date: Thu Dec 1 22:31:31 2011 +0100
fix build failure against curl >= 7.21
libofa-0.9.3-curl.patch | 11 +++++++++++
libofa.spec | 7 ++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/libofa-0.9.3-curl.patch b/libofa-0.9.3-curl.patch
new file mode 100644
index 0000000..7dbea72
--- /dev/null
+++ b/libofa-0.9.3-curl.patch
@@ -0,0 +1,11 @@
+diff -up libofa-0.9.3/examples/protocol.cpp.me libofa-0.9.3/examples/protocol.cpp
+--- libofa-0.9.3/examples/protocol.cpp.me 2011-12-01 21:56:40.740005441 +0100
++++ libofa-0.9.3/examples/protocol.cpp 2011-12-01 21:56:44.970002991 +0100
+@@ -12,7 +12,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ using namespace std;
diff --git a/libofa.spec b/libofa.spec
index ea7dd68..a3f188d 100644
--- a/libofa.spec
+++ b/libofa.spec
@@ -4,7 +4,7 @@
Summary: Open Fingerprint Architecture library
Name: libofa
Version: 0.9.3
-Release: 17%{?dist}
+Release: 18%{?dist}
License: GPLv2
Url: http://code.google.com/p/musicip-libofa/
@@ -16,6 +16,7 @@ Patch1: libofa-0.9.3-gcc41.patch
# Use Libs.private
Patch2: libofa-0.9.3-pkgconfig.patch
Patch3: libofa-0.9.3-gcc44.patch
+Patch4: libofa-0.9.3-curl.patch
BuildRequires: findutils
BuildRequires: pkgconfig sed
@@ -50,6 +51,7 @@ find . -name README -or -name \*.cpp -or -name \*.h | xargs --no-run-if-empty se
%patch1 -p1 -b .gcc41
%patch2 -p1 -b .pkgconfig
%patch3 -p1 -b .gcc43
+%patch4 -p1 -b .curl
## pkg-config < 0.20.0 (apparently?) doesn't grok URL
%if "%(pkg-config --version 2>/dev/null)" < "0.20.0"
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Dec 01 2011 Than Ngo <than at redhat.com> - 0.9.3-18
+- fix build failure against curl >= 7.21
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list