[tuxcmd] Fix build against libarchive 3 Fix glib includes

[Tomas Bzatek]

commit 188ffa01a08de86ff73d28c7cf152090529d7e2f
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Thu Nov 24 19:18:54 2011 +0100

    Fix build against libarchive 3
    Fix glib includes

 tuxcmd-module-gvfs_include-glib.patch            |   11 +++++++++++
 tuxcmd-module-libarchive_libarchive-3.0.0a.patch |   11 +++++++++++
 tuxcmd.spec                                      |   17 +++++++++++++++--
 3 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/tuxcmd-module-gvfs_include-glib.patch b/tuxcmd-module-gvfs_include-glib.patch
new file mode 100644
index 0000000..b4dc0f5
--- /dev/null
+++ b/tuxcmd-module-gvfs_include-glib.patch
@@ -0,0 +1,11 @@
+--- tuxcmd-modules-0.6.70/gvfs/gvfs.c.orig	2011-11-20 14:07:03.990300572 +0000
++++ tuxcmd-modules-0.6.70/gvfs/gvfs.c	2011-11-20 14:07:19.440300466 +0000
+@@ -25,7 +25,7 @@
+ #include <errno.h>
+ 
+ #include <gio/gio.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "vfs_types.h"
+ 
diff --git a/tuxcmd-module-libarchive_libarchive-3.0.0a.patch b/tuxcmd-module-libarchive_libarchive-3.0.0a.patch
new file mode 100644
index 0000000..c4eeafb
--- /dev/null
+++ b/tuxcmd-module-libarchive_libarchive-3.0.0a.patch
@@ -0,0 +1,11 @@
+--- tuxcmd-modules-0.6.70/libarchive/libarchive.c.orig	2011-11-20 12:49:20.348256064 +0000
++++ tuxcmd-modules-0.6.70/libarchive/libarchive.c	2011-11-20 12:50:10.253257075 +0000
+@@ -141,7 +141,7 @@
+ 
+   module_info->ID = g_strdup ("libarchive_plugin");
+   module_info->Name = g_strdup ("libarchive plugin");
+-  module_info->About = g_strdup_printf ("version %s, build date: %s\nusing %s\n", VERSION, BUILD_DATE, ARCHIVE_LIBRARY_VERSION);
++  module_info->About = g_strdup_printf ("version %s, build date: %s\nusing %s\n", VERSION, BUILD_DATE, archive_version_string());
+   module_info->Copyright = g_strdup ("Plugin Copyright (C) 2008-2009 Tomáš Bžatek\nlibarchive sources Copyright (c) 2003-2007 Tim Kientzle");
+ 
+   return module_info;
diff --git a/tuxcmd.spec b/tuxcmd.spec
index f30eeef..faeaeea 100644
--- a/tuxcmd.spec
+++ b/tuxcmd.spec
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.70
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -21,6 +21,11 @@ BuildRequires: desktop-file-utils
 # turn smartlinking off, not needed anymore with fpc-2.2.2-2
 Patch4: tuxcmd-disable-smartlinking.patch
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=755320
+# Bug 755320 - tuxcmd can not be built due to new libarchive and new glib
+Patch5: tuxcmd-module-libarchive_libarchive-3.0.0a.patch
+Patch6: tuxcmd-module-gvfs_include-glib.patch
+
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
 for GTK2. The main goal of this project is to create powerful user-friendly
@@ -57,9 +62,13 @@ This package contains networking GVFS module for Tux Commander file manager.
 
 %prep
 %setup -q -b 1
-
 %patch4 -p1 -b .disable-smartlinking
 
+pushd ../%{name}-modules-%{version}
+%patch5 -p1 -b .libarchive3
+%patch6 -p1 -b .glib-include
+popd
+
 %build
 
 make final_debug
@@ -133,6 +142,10 @@ fi
 
 
 %changelog
+* Thu Nov 24 2011 Tomas Bzatek <tbzatek at redhat.com> - 0.6.70-3
+- Fix build against libarchive 3
+- Fix glib includes
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.70-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild