From 372cf35deacd7905a03f4adbc2966febc4073e5b Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Wed, 3 Dec 2008 19:16:16 +0000
Subject: [PATCH] libtool 2.2 patch

---
 gnome-commander-1.2.8-trunk-libtool22.patch | 14 ++++++++++++++
 gnome-commander.spec                        | 12 +++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 gnome-commander-1.2.8-trunk-libtool22.patch

diff --git a/gnome-commander-1.2.8-trunk-libtool22.patch b/gnome-commander-1.2.8-trunk-libtool22.patch
new file mode 100644
index 0000000..db3c3d4
--- /dev/null
+++ b/gnome-commander-1.2.8-trunk-libtool22.patch
@@ -0,0 +1,14 @@
+--- gnome-commander-1.2.8-svn2330_trunk/configure.in.debug	2008-11-15 02:31:22.000000000 +0900
++++ gnome-commander-1.2.8-svn2330_trunk/configure.in	2008-12-04 04:00:43.000000000 +0900
+@@ -299,9 +299,8 @@
+ }
+ EOF
+ 
+-    if /bin/sh ../libtool --mode=compile ${CC} $PYTHON_CFLAGS -c testpython.c >/dev/null 2>&1 && \
+-        /bin/sh ../libtool --mode=link ${CC} -o testpython.la -rpath `pwd` -module -avoid-version $PYTHON_LIB_LOC testpython.lo $PYTHON_LIBS $PYTHON_EXTRA_LIBS >/dev/null 2>&1 && \
+-        grep 'dlname.*testpython' testpython.la >/dev/null 2>&1; then
++    if ${CC} $PYTHON_CFLAGS $PYTHON_LIBS $PYTHON_EXTRA_LIBS -fPIC -shared -o testpython.so testpython.c -Wl,-soname,testpython.so >/dev/null 2>&1 && \
++        ( objdump --headers --private-headers testpython.so | grep 'testpython' ) >/dev/null 2>&1; then
+         result=yes
+     else
+         result=no
diff --git a/gnome-commander.spec b/gnome-commander.spec
index d53255c..c93f5ea 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -40,7 +40,8 @@ URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.bz2
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
-#Patch0:        gnome-commander-rev1874-hexmode-display.patch
+# Patch0 must be sent upstream
+Patch0:        gnome-commander-1.2.8-trunk-libtool22.patch
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -105,7 +106,8 @@ ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-#%%patch0 -p0 -b .hexdumpmode
+%patch0 -p1 -b .libtool22
+
 %if 0%{use_autotool} > 0
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
 sh autogen.sh
@@ -145,7 +147,10 @@ replace_icon	gnome-fs-web		folder-remote
    --bindir=%{_libexecdir}/%{name} \
    --disable-scrollkeeper \
    --enable-python
-%{__make} %{?_smp_mflags} -k
+# Sometimes parallel make fails (perhaps), however once
+# force it.
+%{__make} %{?_smp_mflags} -k || :
+%{__make}
 
 %install
 %{__rm} -rf %{buildroot}
@@ -211,6 +216,7 @@ scrollkeeper-update -q || :
 %changelog
 * Thu Dec  4 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - rev 2330
+- Add patch to compile with libtool 2.2
 
 * Mon Oct 20 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - 1.2.8 branch