[libtunepimp] apply patch to build against curl 7.21

Than Ngo than at fedoraproject.org
Fri Dec 2 16:10:58 UTC 2011


commit 51e4d4447afeb24ec08372871d641e15a97337df
Author: Than Ngo <than at redhat.com>
Date:   Fri Dec 2 17:10:49 2011 +0100

    apply patch to build against curl 7.21

 libtunepimp-0.5.3-curl.patch |   11 +++++++++++
 libtunepimp.spec             |   16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
---
diff --git a/libtunepimp-0.5.3-curl.patch b/libtunepimp-0.5.3-curl.patch
new file mode 100644
index 0000000..e08224e
--- /dev/null
+++ b/libtunepimp-0.5.3-curl.patch
@@ -0,0 +1,11 @@
+diff -up libtunepimp-0.5.3/lib/protocol.cpp.me libtunepimp-0.5.3/lib/protocol.cpp
+--- libtunepimp-0.5.3/lib/protocol.cpp.me	2011-12-02 15:33:29.000000000 +0100
++++ libtunepimp-0.5.3/lib/protocol.cpp	2011-12-02 15:33:54.000000000 +0100
+@@ -13,7 +13,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ using namespace std;
+ 
diff --git a/libtunepimp.spec b/libtunepimp.spec
index 79802ae..e6cdc04 100644
--- a/libtunepimp.spec
+++ b/libtunepimp.spec
@@ -3,10 +3,13 @@
 %define _with_mp4 1
 %endif
 
+# libtool2 (libltdl) building busted
+#define use_autofoo 1
+
 Summary: A library for creating MusicBrainz enabled tagging applications 
 Name:	 libtunepimp
 Version: 0.5.3
-Release: 18%{?dist}
+Release: 19%{?dist}
 
 License: LGPLv2+
 Group: 	 System Environment/Libraries
@@ -17,13 +20,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch1: libtunepimp-0.5.3-gcc43.patch
 Patch2: libtunepimp-0.5.3-glibc210_strrchr.patch 
+# build against curl 7.21
+Patch3: libtunepimp-0.5.3-curl.patch
 
 %define pkglibdir %{_libdir}/tunepimp
 
-%if 0%{?fedora} > 10
-# libtool2 (libltdl) building busted
-%else
-%define use_autofoo 1
+%if 0%{?use_autofoo}
 BuildRequires: automake libtool libtool-ltdl-devel
 %endif
 BuildRequires: chrpath
@@ -81,6 +83,7 @@ Group:   Development/Libraries
 
 %patch1 -p1 -b .gcc43
 %patch2 -p1 -b .glibc210_strrchr.patch
+%patch3 -p1 -b .curl
 
 # nuke rpath -- Rex
 %if 0%{?use_autofoo}
@@ -167,6 +170,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Dec 02 2011 Than Ngo <than at redhat.com> - 0.5.3-19
+- apply patch to build against curl 7.21
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list