[pinot] Apply patches to fix broken dep

[drago01]

commit 06a84bb0bb1bf01e11d1e4d9cfca679df0d68fe5
Author: Adel Gadllah <adel.gadllah at gmail.com>
Date:   Sun Nov 20 22:47:37 2011 +0100

    Apply patches to fix broken dep
    
    Apply patches from Niels de Vos <devos at fedoraproject.org> that fix
    building with the new libarchive.

 pinot-0.97_include-glib.patch   |   11 +++++++++++
 pinot-0.97_libarchive-3.0.patch |   13 +++++++++++++
 pinot.spec                      |   10 +++++++++-
 3 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/pinot-0.97_include-glib.patch b/pinot-0.97_include-glib.patch
new file mode 100644
index 0000000..500f555
--- /dev/null
+++ b/pinot-0.97_include-glib.patch
@@ -0,0 +1,11 @@
+--- pinot-0.97/IndexSearch/cjkv/CJKVTokenizer.h.orig	2011-11-20 14:44:04.473300701 +0000
++++ pinot-0.97/IndexSearch/cjkv/CJKVTokenizer.h	2011-11-20 14:44:23.241363000 +0000
+@@ -25,7 +25,7 @@
+ #ifdef HAVE_UNICODE_H
+ #include <unicode.h>
+ #else
+-#include <glib/gunicode.h>
++#include <glib.h>
+ #define unicode_char_t gunichar
+ #endif
+ 
diff --git a/pinot-0.97_libarchive-3.0.patch b/pinot-0.97_libarchive-3.0.patch
new file mode 100644
index 0000000..e3d6343
--- /dev/null
+++ b/pinot-0.97_libarchive-3.0.patch
@@ -0,0 +1,13 @@
+--- pinot-0.97/Tokenize/filters/ArchiveFilter.cc.orig	2011-11-20 14:20:32.336306086 +0000
++++ pinot-0.97/Tokenize/filters/ArchiveFilter.cc	2011-11-20 14:20:40.160376456 +0000
+@@ -204,6 +204,10 @@
+ 		fcntl(m_fd, F_SETFD, fdFlags|FD_CLOEXEC);
+ #endif
+ 
++#ifndef ARCHIVE_DEFAULT_BYTES_PER_BLOCK
++#warning "libarchive 3.x does not define ARCHIVE_DEFAULT_BYTES_PER_BLOCK any more, using old value"
++#define ARCHIVE_DEFAULT_BYTES_PER_BLOCK 10240
++#endif
+ 		if (archive_read_open_fd(m_pHandle, m_fd, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) == ARCHIVE_OK)
+ 		{
+ 			m_parseDocument = true;
diff --git a/pinot.spec b/pinot.spec
index 8ce8c2e..64910b4 100644
--- a/pinot.spec
+++ b/pinot.spec
@@ -1,12 +1,14 @@
 Name:  pinot
 Version: 0.97
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Personal search and metasearch for the Desktop
 
 Group: User Interface/Desktops
 License: GPLv2+
 URL: http://pinot.berlios.de/
 Source0: http://download2.berlios.de/pinot/%{name}-%{version}.tar.gz
+Patch1: pinot-0.97_libarchive-3.0.patch
+Patch2: pinot-0.97_include-glib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,6 +57,8 @@ The included plugin enables Deskbar to search documents indexed by Pinot
 
 %prep
 %setup -q
+%patch1 -p1 -b .libarchive-3.x
+%patch2 -p1 -b .include-glib
 
 %build
 autoreconf --force --install
@@ -127,6 +131,10 @@ fi
 
 
 %changelog
+* Sun Nov 20 2011 Niels de Vos <devos at fedoraproject.org> - 0.97-2
+- Fix compiling against libarchive-3.x
+- Fix including glib.h
+
 * Wed May 20 2011 Martin Dengler <martin at martindengler.com> - 0.97-1
 - New upstream version