From e9e1d1142e5c0512402e9829386930d7bc7684f7 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Sat, 6 Dec 2008 13:32:53 +0000
Subject: [PATCH] - rev 2332 - libtool 2.2 patch went upstream - "replace_icon"
 hack seems no longer needed

---
 .cvsignore           |  2 +-
 gnome-commander.spec | 15 ++++++++-------
 sources              |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ccafe1b..d74e14b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-commander-1.2.8-svn2330_trunk.tar.bz2
+gnome-commander-1.2.8-svn2332_trunk.tar.bz2
diff --git a/gnome-commander.spec b/gnome-commander.spec
index fdf8502..3664de9 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -18,7 +18,7 @@
 %define        use_autotool          0
 %define        if_pre                1
 %define        main_release          1
-%define        extratag              svn2330_trunk
+%define        extratag              svn2332_trunk
 %define        mimeedit_rev          1958
 
 %if 0%{?if_pre} > 0
@@ -29,7 +29,7 @@
 
 Name:          gnome-commander
 Version:       1.2.8
-Release:       %{fedora_rel}%{?dist}.1
+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
@@ -40,8 +40,6 @@ 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 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)
 
@@ -106,7 +104,6 @@ ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-%patch0 -p1 -b .libtool22
 
 %if 0%{use_autotool} > 0
 %{__sed} -i.conf '$s|^\(.*\)|NOCONFIGURE=1 \1|' autogen.sh
@@ -114,13 +111,12 @@ sh autogen.sh
 %endif
 
 cp -p %SOURCE10 mimeedit.sh
-%patch10 -p0
 
 %{__sed} -i.pylib \
    -e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
    configure
 
-%if 0%{?fedora} >= 10
+%if 0%{?fedora} >= 10 && 0
 function replace_icon(){
 	find . -name \*.cc | xargs grep -l $1 | \
 		xargs %{__sed} -i.icon -e "s|\"$1\"|\"$2\"|"
@@ -214,6 +210,11 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Sat Dec  6 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 2332
+- libtool 2.2 patch went upstream
+- "replace_icon" hack seems no longer needed
+
 * Thu Dec  4 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - rev 2330
 - Add patch to compile with libtool 2.2
diff --git a/sources b/sources
index 23763ac..71696d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-716431349ba11922ae13e4cba63ad2d4  gnome-commander-1.2.8-svn2330_trunk.tar.bz2
+911ac789d0821f40d06b969cf41cc899  gnome-commander-1.2.8-svn2332_trunk.tar.bz2