rpms/tuxcmd/devel tuxcmd-modules-ziparchive-gcc43.patch, NONE, 1.1 tuxcmd.spec, 1.3, 1.4 tuxcmd-modules-0.6.36-disable-zip.patch, 1.1, NONE

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/tuxcmd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10793

Modified Files:
	tuxcmd.spec 
Added Files:
	tuxcmd-modules-ziparchive-gcc43.patch 
Removed Files:
	tuxcmd-modules-0.6.36-disable-zip.patch 
Log Message:
* Mon Jun  9 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-3
- Add ZIP module


tuxcmd-modules-ziparchive-gcc43.patch:

--- NEW FILE tuxcmd-modules-ziparchive-gcc43.patch ---
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Mon, 9 Jun 2008 09:44:55 +0000 (+0200)
Subject: Fixed gcc-4.3.0 compatibility
X-Git-Url: http://git.bzatek.net/?p=tuxcmd-modules%2F.git;a=commitdiff_plain;h=4e58288e8e2e76e8d518b21273f787be16a486c3

Fixed gcc-4.3.0 compatibility
---

diff --git a/zip/ZipArchive/ZipString_stl.h b/zip/ZipArchive/ZipString_stl.h
index 330ce65..6ef0edc 100644
--- a/zip/ZipArchive/ZipString_stl.h
+++ b/zip/ZipArchive/ZipString_stl.h
@@ -23,7 +23,7 @@
 #endif
 
 
-#include <string>
+#include <string.h>
 #include <algorithm>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/zip/ZipArchive/std_stl.h b/zip/ZipArchive/std_stl.h
index c755d22..c54d0bf 100644
--- a/zip/ZipArchive/std_stl.h
+++ b/zip/ZipArchive/std_stl.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "_features.h"
+#include <limits.h>
 
 #if _MSC_VER > 1000
 	// STL warnings


Index: tuxcmd.spec
===================================================================
RCS file: /cvs/extras/rpms/tuxcmd/devel/tuxcmd.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tuxcmd.spec	6 Jun 2008 16:29:46 -0000	1.3
+++ tuxcmd.spec	9 Jun 2008 11:09:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           tuxcmd
 Version:        0.6.36
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tux Commander: file manager with 2 panels side by side using GTK2
 
 Group:          Applications/File
@@ -20,7 +20,7 @@
 BuildRequires: gtk2-devel
 BuildRequires: desktop-file-utils
 
-Patch1: tuxcmd-modules-0.6.36-disable-zip.patch
+Patch1: tuxcmd-modules-ziparchive-gcc43.patch
 
 
 %description
@@ -60,7 +60,7 @@
 %prep
 %setup -b 1 -q
 cd ../%{name}-modules-%{version}
-%patch1 -p1 -b .disable-zip
+%patch1 -p1 -b .gcc43
 
 
 %build
@@ -86,6 +86,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT/usr
 mkdir -p doc/libarchive
 cp -pr libarchive/{COPYING,README} doc/libarchive
+mkdir -p doc/zip
+cp -pr zip/{COPYING,README} doc/zip
 
 
 
@@ -104,7 +106,9 @@
 %files modules
 %defattr(-,root,root,-)
 %doc ../%{name}-modules-%{version}/doc/libarchive
+%doc ../%{name}-modules-%{version}/doc/zip
 %{_libdir}/tuxcmd/libarchive_plugin.so
+%{_libdir}/tuxcmd/libzip_plugin.so
 
 %files gnomevfs2
 %defattr(-,root,root,-)
@@ -114,6 +118,9 @@
 
 
 %changelog
+* Mon Jun  9 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-3
+- Add ZIP module
+
 * Fri Jun  6 2008 Tomas Bzatek <tbzatek at redhat.com> 0.6.36-2
 - Add modules (gnome-vfs2, libarchive)
 


--- tuxcmd-modules-0.6.36-disable-zip.patch DELETED ---