From 4d03e012d06577c3690266c3559625eb873142d9bb79fe991b07e65a10976b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 19 Mar 2012 18:36:51 +0000
Subject: [PATCH] Accepting request 109984 from home:dimstar:gcc47

- added patch to fix gcc 4.7 failure (gcc47.diff)
- added fdupes (forwarded request 109983 from ealin)

OBS-URL: https://build.opensuse.org/request/show/109984
OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=38
---
 gcc47.diff    | 33 +++++++++++++++++++++++++++++++++
 hugin.changes |  6 ++++++
 hugin.spec    |  9 ++++++---
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 gcc47.diff

diff --git a/gcc47.diff b/gcc47.diff
new file mode 100644
index 0000000..3aec145
--- /dev/null
+++ b/gcc47.diff
@@ -0,0 +1,33 @@
+diff -r 658ded2153f2 src/celeste/Utilities.h
+--- a/src/celeste/Utilities.h Sun Jan 01 13:23:39 2012 +0100
++++ b/src/celeste/Utilities.h SunSat Jan 07 19:38:25 2012 +0000
+@@ -33,6 +33,8 @@
+ #include <stdio.h>
+ #ifdef _WINDOWS
+ #include "direct.h"
++#else
++#include <unistd.h>
+ #endif
+ 
+ using namespace std; 
+diff -r 658ded2153f2 src/foreign/zthread/include/zthread/Guard.h
+--- a/src/foreign/zthread/include/zthread/Guard.h SunSatSun Jan 01 13:23:39 2012 +0100
++++ b/src/foreign/zthread/include/zthread/Guard.h SunSatSunSat Jan 07 19:38:25 2012 +0000
+@@ -428,7 +428,7 @@
+   template <class U, class V>
+   Guard(Guard<U, V>& g) : LockHolder<LockType>(g) {
+ 
+-    LockingPolicy::shareScope(*this, extract(g));
++    LockingPolicy::shareScope(*this, this->extract(g));
+     
+   }
+ 
+@@ -458,7 +458,7 @@
+   template <class U, class V>
+   Guard(Guard<U, V>& g, LockType& lock) : LockHolder<LockType>(lock) {
+ 
+-    LockingPolicy::transferScope(*this, extract(g));
++    LockingPolicy::transferScope(*this, this->extract(g));
+ 
+   }
+ 
diff --git a/hugin.changes b/hugin.changes
index 4627071..a6ce852 100644
--- a/hugin.changes
+++ b/hugin.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 19 17:30:17 UTC 2012 - alinm.elena@gmail.com
+
+- added patch to fix gcc 4.7 failure (gcc47.diff)
+- added fdupes 
+
 -------------------------------------------------------------------
 Tue Jan 10 16:55:03 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/hugin.spec b/hugin.spec
index e4bf51a..c525ee1 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           hugin
 BuildRequires:  Mesa-devel
 BuildRequires:  OpenEXR-devel
@@ -24,21 +23,22 @@ BuildRequires:  SDL-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  fdupes
+BuildRequires:  fdupes
 BuildRequires:  fftw3-devel
 BuildRequires:  freeglut-devel
 BuildRequires:  gcc-c++
 BuildRequires:  glew-devel
 BuildRequires:  lapack
 BuildRequires:  libexiv2-devel
+BuildRequires:  libjpeg-devel
 BuildRequires:  liblapack3
 BuildRequires:  libpano-devel >= 2.9.18
+BuildRequires:  libtiff-devel
 BuildRequires:  libxml2
 BuildRequires:  tclap
 BuildRequires:  update-desktop-files
 BuildRequires:  vigra
 BuildRequires:  zip
-BuildRequires:  libtiff-devel
-BuildRequires:  libjpeg-devel
 %if 0%{?suse_version} > 1130
 BuildRequires:  python-wxWidgets >= 2.7.0
 BuildRequires:  wxWidgets-devel
@@ -58,6 +58,7 @@ Source:         http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}
 # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin
 #Source:         %%{name}-svn2008xxxx.tar.bz2
 Source1:        %{name}-svn-dummy
+Patch0:         gcc47.diff
 Requires:       enblend-enfuse >= 3.2
 Recommends:     autopano-sift
 Recommends:     exiftool
@@ -96,6 +97,7 @@ rm README_JP.new
 #mkdir bin
 #cp %%{SOURCE1} bin/svn
 #chmod +x bin/svn
+%patch0 -p1
 
 %build
 export PATH=$PWD/bin:$PATH
@@ -119,6 +121,7 @@ mv %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -a AUTHORS authors.txt COPYING ChangeLog LICENCE_VIGRA README README_JP TODO %{buildroot}%{_docdir}/%{name}/
 chmod -x %{buildroot}%{_docdir}/%{name}/*
+%fdupes %{buildroot}
 
 %post
 %if 0%{?suse_version} > 1130