[gimmix] 0.5.7.1-6

[Andreas Bierfert]

commit e0c5cfa2a170c63887be6677dce729e3b5bce836
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Jul 26 19:58:09 2012 +0200

    0.5.7.1-6
    
    - fix ftbfs (#843223)

 gimmix-curl.patch |   24 ++++++++++++++++++++++++
 gimmix.spec       |   10 +++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/gimmix-curl.patch b/gimmix-curl.patch
new file mode 100644
index 0000000..9901657
--- /dev/null
+++ b/gimmix-curl.patch
@@ -0,0 +1,24 @@
+diff --git a/src/gimmix-covers.c b/src/gimmix-covers.c
+index f2524c4..2dc37f3 100644
+--- a/src/gimmix-covers.c
++++ b/src/gimmix-covers.c
+@@ -29,7 +29,6 @@
+ #include <glib.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <nxml.h>
+ #include <libxml/xmlreader.h>
+diff --git a/src/gimmix-lyrics.c b/src/gimmix-lyrics.c
+index ff58954..01990e2 100644
+--- a/src/gimmix-lyrics.c
++++ b/src/gimmix-lyrics.c
+@@ -30,7 +30,6 @@
+ #include <nxml.h>
+ #include <glib/gstdio.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <libxml/xmlreader.h>
+ #include "gimmix-lyrics.h"
diff --git a/gimmix.spec b/gimmix.spec
index 21a9f6e..e7adf77 100644
--- a/gimmix.spec
+++ b/gimmix.spec
@@ -1,6 +1,6 @@
 Name:           gimmix
 Version:        0.5.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Graphical music player daemon (MPD) client
 
 Group:          Applications/Multimedia
@@ -11,6 +11,9 @@ Source1:        gimmix.desktop
 
 # See #564619
 Patch1:         gimmix-Makefile.patch
+# fix curl build
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-sound/gimmix/files/gimmix-0.5.7.1-curl-headers.patch?revision=1.1
+Patch2:         gimmix-curl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -31,6 +34,7 @@ your audio experience a pleasant one.
 %prep
 %setup -q
 %patch1
+%patch2 -p1 -b curl
 
 %build
 chmod -x src/*
@@ -66,6 +70,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 26 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.5.7.1-6
+- fix ftbfs (#843223)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild