[packages/gnome-commander] - updated to 1.2.8.15 - use *.xz sources - patch to build with gcc47

[kiesiu]

commit f8c673aa1ff3545e9f0a18a41b52f40de71e2ea4
Author: Łukasz Kieś <kiesiu at pld-linux.org>
Date:   Fri Sep 7 12:54:47 2012 +0200

    - updated to 1.2.8.15
    - use *.xz sources
    - patch to build with gcc47

 gnome-commander-gcc47.patch | 25 +++++++++++++++++++++++++
 gnome-commander.spec        | 18 +++++++++++-------
 2 files changed, 36 insertions(+), 7 deletions(-)
---
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 2efbe17..1a4f3fa 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,14 +1,15 @@
 Summary:	A GNOME filemanager similar to the Midnight Commander
 Summary(pl.UTF-8):	Zarządca plików dla środowiska GNOME w stylu Midnight Commandera
 Name:		gnome-commander
-Version:	1.2.8.12
-Release:	5
+Version:	1.2.8.15
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5:	210cd59699dda373a80367b5141a3157
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.xz
+# Source0-md5:	da2f36851f96bc9b2ea7ea363875efed
 Patch0:		%{name}-flags.patch
-Patch1:		gnome-commander-1.2.8.15-poppler020.patch
+Patch1:		%{name}-1.2.8.15-poppler020.patch
+Patch2:		%{name}-gcc47.patch
 URL:		http://www.nongnu.org/gcmd/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -27,6 +28,8 @@ BuildRequires:	pkgconfig
 BuildRequires:	poppler-devel
 BuildRequires:	python-devel
 BuildRequires:	taglib-devel
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,6 +52,7 @@ kilka dodatkowych jak np. klienta FTP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -69,8 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/{plugins/,}/*.{la,a}
 
-[ -d $RPM_BUILD_ROOT%{_datadir}/locale/sr at latin ] || \
-	mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sr@{Latn,latin}
+[ -d $RPM_BUILD_ROOT%{_localedir}/sr at latin ] || \
+	mv -f $RPM_BUILD_ROOT%{_localedir}/sr@{Latn,latin}
 
 %find_lang %{name} --with-gnome --all-name
 
diff --git a/gnome-commander-gcc47.patch b/gnome-commander-gcc47.patch
new file mode 100644
index 0000000..b6e0750
--- /dev/null
+++ b/gnome-commander-gcc47.patch
@@ -0,0 +1,25 @@
+diff -uNr gnome-commander-1.2.8.15.old/src/dict.h gnome-commander-1.2.8.15/src/dict.h
+--- gnome-commander-1.2.8.15.old/src/dict.h	2011-11-08 00:26:25.000000000 +0100
++++ gnome-commander-1.2.8.15/src/dict.h	2012-09-07 12:49:19.238247858 +0200
+@@ -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;
+@@ -114,8 +114,8 @@
+ template <typename T>
+ inline void DICT<T,T>::add(const T k, const T &v)
+ {
+-    std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(make_pair(k,(T *) NULL));
+-    std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(make_pair(v,(T *) NULL));
++    std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(std::make_pair(k,(T *) NULL));
++    std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(std::make_pair(v,(T *) NULL));
+ 
+     if (k_pos.second)
+         k_pos.first->second = &v_pos.first->first;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-commander.git/commitdiff/f8c673aa1ff3545e9f0a18a41b52f40de71e2ea4