[libopensync-plugin-opie] 1:0.22-8

[Andreas Bierfert]

commit e7c9f8e0dedcaa17190b97114bb668fd58db25af
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Jul 26 20:11:48 2012 +0200

    1:0.22-8
    
    - fix ftbfs (#843241)

 libopensync-plugin-opie-curl-include.patch |   11 +++++++++++
 libopensync-plugin-opie.spec               |   10 ++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/libopensync-plugin-opie-curl-include.patch b/libopensync-plugin-opie-curl-include.patch
new file mode 100644
index 0000000..4aee167
--- /dev/null
+++ b/libopensync-plugin-opie-curl-include.patch
@@ -0,0 +1,11 @@
+diff -up libopensync-plugin-opie-0.22/src/opie_comms.c.orig libopensync-plugin-opie-0.22/src/opie_comms.c
+--- libopensync-plugin-opie-0.22/src/opie_comms.c.orig	2012-07-26 20:08:16.331904615 +0200
++++ libopensync-plugin-opie-0.22/src/opie_comms.c	2012-07-26 20:08:31.181959428 +0200
+@@ -35,7 +35,6 @@
+ #include <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #include <openssl/md5.h>
+ 
diff --git a/libopensync-plugin-opie.spec b/libopensync-plugin-opie.spec
index 9eb7e5d..6ca8b60 100644
--- a/libopensync-plugin-opie.spec
+++ b/libopensync-plugin-opie.spec
@@ -1,7 +1,7 @@
 Name:           libopensync-plugin-opie
 Epoch:          1
 Version:        0.22
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Synchronisation with the Opie handheld environment
 
 Group:          System Environment/Libraries
@@ -11,6 +11,7 @@ URL:            http://www.opensync.org
 Source0:        http://www.opensync.org/download/releases/%{version}/%{name}-%{version}.tar.bz2
 Source1:        PACKAGE-LICENSING
 Patch0:         libopensync-plugin-opie-curl-setopt.patch
+Patch1:         libopensync-plugin-opie-curl-include.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libopensync-devel = 1:0.22
@@ -23,7 +24,8 @@ handheld environment (http://opie.handhelds.org).
 
 %prep
 %setup -q
-%patch0
+%patch0 -b curlsetopt
+%patch1 -p1 -b curlinclude
 
 %build
 %configure
@@ -48,6 +50,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/opensync/defaults/opie-sync
 
 %changelog
+* Thu Jul 26 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1:0.22-8
+- fix ftbfs (#843241)
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.22-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild