[gnome-commander] F-17: rebuild against gcc47

[Mamoru Tasaka]

commit be5bedc072881ce35357df6f8d8d398b775ea782
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date:   Thu Jan 5 11:31:30 2012 +0900

    F-17: rebuild against gcc47

 gnome-commander-1.2.8.15-gcc47.patch |   13 +++++++++++++
 gnome-commander.spec                 |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gnome-commander-1.2.8.15-gcc47.patch b/gnome-commander-1.2.8.15-gcc47.patch
new file mode 100644
index 0000000..94e65ea
--- /dev/null
+++ b/gnome-commander-1.2.8.15-gcc47.patch
@@ -0,0 +1,13 @@
+--- gnome-commander-1.2.8.15/src/dict.h.gcc47	2011-11-08 08:26:25.000000000 +0900
++++ gnome-commander-1.2.8.15/src/dict.h	2012-01-05 11:26:39.649243923 +0900
+@@ -55,8 +55,8 @@
+ template <typename KEY, typename VAL>
+ inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
+ {
+-    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
+-    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
++    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL));
++    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL));
+ 
+     if (k_pos.second)
+         k_pos.first->second = &v_pos.first->first;
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 6564c8e..c545da8 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -26,7 +26,7 @@
 %global        use_autotool          0
 %global        update_po             0
 %global        if_pre                0
-%global        main_release          1
+%global        main_release          2
 %global        extratag              git_%{git_pull_JST}
 %undefine      extratag
 %global        mimeedit_rev          1958
@@ -59,6 +59,7 @@ URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}%{?extratag:-%extratag}.tar.xz
 Source1:       gnome-commander.sh
 Source10:      mimeedit-svn%{mimeedit_rev}.sh
+Patch0:        gnome-commander-1.2.8.15-gcc47.patch
 Patch10:       mimeedit-svn1958.diff
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -125,6 +126,7 @@ ansluta till FTP-servrar och SMB-nätverk.
 
 %prep
 %setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+%patch0 -p1
 
 %if 0%{use_autotool} > 0
 ( export NOCONFIGURE=1 ; sh autogen.sh )
@@ -239,6 +241,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Jan  5 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3:1.2.8.15-2
+- F-17: rebuild against gcc47
+
 * Wed Dec  7 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 3:1.2.8.15-1
 - Update to 1.2.8.15