- try rev 1862

.cvsignore

@@ -1 +1 @@
-gnome-commander-1.2.6.tar.bz2
+gnome-commander-1.2.7-svn1862_trunk.tar.bz2

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

@@ -1,40 +0,0 @@
---- 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>

gnome-commander.spec

@@ -1,10 +1,27 @@
+# To use svn, follow:
+#
+# svn checkout svn://svn.gnome.org/svn/gnome-commander/trunk
+# mv trunk %%{name}-%%{version}-%%{extratag}
+# tar cjf %%{name}-%%{version}-%%{extratag}.tar.bz2 %%{name}-%%{version}-%%{extratag}
+
 %define        EXIV2_REQ             0.14
 %define        TAGLIB_REQ            1.4
 %define        LIBGSF_REQ            1.12.0
 
+%define        use_autotool          0
+%define        if_pre                1
+%define        main_release          1
+%define        extratag              svn1862_trunk
+
+%if 0%{?if_pre} > 0
+%define        use_autotool          1
+%endif
+
+%define        fedora_rel            %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
+
 Name:          gnome-commander
-Version:       1.2.6
-Release:       3%{?dist}
+Version:       1.2.7
+Release:       %{fedora_rel}%{?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
@@ -12,8 +29,8 @@ Summary(sv):   GNOME Commander är en snabb och smidig filhanderare för GNOME
 Group:         Applications/File
 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
+Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
+Source1:       gcmd-ja.po
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -33,6 +50,14 @@ BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
 BuildRequires: python-devel
 
+%if %{use_autotool}
+BuildRequires: automake
+BuildRequires: flex
+BuildRequires: intltool
+BuildRequires: libtool
+BuildRequires: gnome-common
+%endif
+
 Requires:         gnome-python2-gnomevfs
 Requires:         meld
 Requires(post):   scrollkeeper
@@ -67,8 +92,17 @@ Utöver att kunna hantera filer på din egen dator så kan programmet även
 ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
-%setup -q
-%patch0 -p1 -b .debug
+%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+%if 0%{use_autotool} > 0
+%{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
+sh autogen.sh
+%endif
+%{__install} -cpm 0644 %SOURCE1 po/ja.po
+echo "ja" >> po/LINGUAS
+
+%{__sed} -i.pylib \
+   -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
+   configure
 
 %build
 %configure \
@@ -128,8 +162,8 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
-* Wed Jun 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.2.6-3 
-- respin for exiv2
+* Sat Jun 28 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- try rev 1862
 
 * Mon Jun  2 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.2.6-2
 - 1.2.6

sources

@@ -1 +1 @@
-4a3d3ebd24af3f386fbbf2985acbc786  gnome-commander-1.2.6.tar.bz2
+de2dfce2ba5ecc24aa5318792d1d2c78  gnome-commander-1.2.7-svn1862_trunk.tar.bz2