rpms/gnome-commander/devel gnome-commander-1.2.6-fix-compilation-includes.patch, NONE, 1.1 gnome-commander.spec, 1.16, 1.17

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/gnome-commander/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3044

Modified Files:
	gnome-commander.spec 
Added Files:
	gnome-commander-1.2.6-fix-compilation-includes.patch 
Log Message:
* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.6-2
- 1.2.6
- Add patch to compile with GTK 2.13.X


gnome-commander-1.2.6-fix-compilation-includes.patch:

--- NEW FILE gnome-commander-1.2.6-fix-compilation-includes.patch ---
--- gnome-commander-1.2.6/src/gnome-cmd-includes.h.debug	2008-06-01 23:44:25.000000000 +0900
+++ gnome-commander-1.2.6/src/gnome-cmd-includes.h	2008-06-02 18:14:31.000000000 +0900
@@ -21,6 +21,7 @@
 #define __GNOME_CMD_INCLUDES_H__
 
 #include <libgcmd/libgcmd.h>
+#include <gtk/gtkmarshal.h>
 
 typedef void *(*PthreadFunc)(void *);
 
--- gnome-commander-1.2.6/src/intviewer/image-render.cc.debug	2008-06-01 23:44:25.000000000 +0900
+++ gnome-commander-1.2.6/src/intviewer/image-render.cc	2008-06-02 18:02:28.000000000 +0900
@@ -32,6 +32,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtkadjustment.h>
+#include <gtk/gtkmarshal.h>
 
 #include "image-render.h"
 #include "gnome-cmd-includes.h"
--- gnome-commander-1.2.6/src/intviewer/text-render.cc.debug	2008-06-01 23:44:25.000000000 +0900
+++ gnome-commander-1.2.6/src/intviewer/text-render.cc	2008-06-02 18:04:03.000000000 +0900
@@ -34,6 +34,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkadjustment.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtkmarshal.h>
 
 #include "gvtypes.h"
 #include "fileops.h"
--- gnome-commander-1.2.6/src/intviewer/viewer-widget.cc.debug	2008-06-01 23:44:25.000000000 +0900
+++ gnome-commander-1.2.6/src/intviewer/viewer-widget.cc	2008-06-02 18:04:50.000000000 +0900
@@ -32,6 +32,7 @@
 
 #include <gtk/gtk.h>
 #include <gtk/gtktable.h>
+#include <gtk/gtkmarshal.h>
 
 #include <libgnome/libgnome.h>
 #include <libgnomevfs/gnome-vfs.h>


Index: gnome-commander.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-commander/devel/gnome-commander.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnome-commander.spec	2 Jun 2008 07:14:42 -0000	1.16
+++ gnome-commander.spec	2 Jun 2008 09:42:43 -0000	1.17
@@ -4,7 +4,7 @@
 
 Name:          gnome-commander
 Version:       1.2.6
-Release:       0%{?dist}
+Release:       2%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 Summary(pl):   Menadżer plików dla GNOME oparty o Norton Commander'a (TM)
 Summary(sv):   GNOME Commander är en snabb och smidig filhanderare för GNOME
@@ -13,6 +13,7 @@
 License:       GPLv2+
 URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
+Patch0:        gnome-commander-1.2.6-fix-compilation-includes.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -67,12 +68,13 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .debug
 
 %build
 %configure \
    --disable-scrollkeeper \
    --enable-python
-%{__make} %{?_smp_mflags} -k
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -126,8 +128,9 @@
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.6-1
+* Mon Jun  2 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.6-2
 - 1.2.6
+- Add patch to compile with GTK 2.13.X
 
 * Sat Mar  1 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.2.5-1
 - 1.2.5