From f14225cf2eb32ace36f7d8d267eb3d485681b3a1 Mon Sep 17 00:00:00 2001
From: Radek Novacek <rnovacek@redhat.com>
Date: Jan 16 2012 07:49:19 +0000
Subject: Fix build failure with g++ 4.7


---

diff --git a/krusader-2.4.0-beta1-fix-for-g++47.patch b/krusader-2.4.0-beta1-fix-for-g++47.patch
new file mode 100644
index 0000000..2835a5f
--- /dev/null
+++ b/krusader-2.4.0-beta1-fix-for-g++47.patch
@@ -0,0 +1,21 @@
+diff -up krusader-2.4.0-beta1/krusader/UserAction/tstring.h.fix-for-g++47 krusader-2.4.0-beta1/krusader/UserAction/tstring.h
+--- krusader-2.4.0-beta1/krusader/UserAction/tstring.h.fix-for-g++47	2012-01-16 08:44:16.064963041 +0100
++++ krusader-2.4.0-beta1/krusader/UserAction/tstring.h	2012-01-16 08:44:33.988425196 +0100
+@@ -125,7 +125,7 @@ TagString_t<T>& TagString_t<T>::operator
+     str += s.str;
+     const unsigned disp = length();
+     for (typename taglist::const_iterator it = s.tags.begin(), end = s.tags.end();it != end;++it) {
+-        tags.push_back(make_pair((*it).first + disp, (*it).second));
++        tags.push_back(std::make_pair((*it).first + disp, (*it).second));
+     }
+     return *this;
+ }
+@@ -134,7 +134,7 @@ template <class T>
+ void TagString_t<T>::insertTag(uint pos, const T& t)
+ {
+     assert(pos <= length());
+-    tags.push_back(make_pair(pos, t));
++    tags.push_back(std::make_pair(pos, t));
+ }
+ 
+ #endif
diff --git a/krusader.spec b/krusader.spec
index 5be75cb..7a77ddb 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,7 +1,7 @@
 Name:		krusader
 Version:	2.4.0
 %global beta beta1
-Release:	0.3.%{beta}%{?dist}
+Release:	0.4.%{beta}%{?dist}
 Summary:	An advanced twin-panel (commander-style) file-manager for KDE
 
 Group:		Applications/File
@@ -11,6 +11,8 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}%{?beta:-%{b
 # adds default MIME type handlers for (tar.)lzma legacy archives
 # fixes bz2 (non-tar) MIME type
 Patch0:		krusader-2.3.0-beta1-default-mimetypes.patch
+# Fix build failure with g++ 4.7
+Patch1:		krusader-2.4.0-beta1-fix-for-g++47.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -37,6 +39,7 @@ friendly, fast and looks great on your desktop! You should give it a try.
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 # apply this one after the upstream patch since it touches the same file
 %patch0 -p1 -b .mimetypes
+%patch1 -p1 -b .fix-for-g++47
 
 %build
 mkdir -p %{_target_platform}
@@ -100,6 +103,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/krusader.1.gz
 
 %changelog
+* Mon Jan 16 2012 Radek Novacek <rnovacek@redhat.com> 2.4.0-0.4.beta1
+- Fix build failure with g++ 4.7
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-0.3.beta1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild