From 688463347e89fa908d7378e14cfde2c35487aba13e695fa1f848564b46db2233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 26 Jul 2013 09:44:43 +0000
Subject: [PATCH] - Fix build with perl 5.18 by adding hugin-perl-5.18.patch -
 Remove old opensuse version conditionals as the package anyway   builds only
 on 12.3 and later, unresolvable on older ones.

OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=46
---
 hugin-perl-5.18.patch |  9 +++++++++
 hugin.changes         |  7 +++++++
 hugin.spec            | 39 +++++++++++----------------------------
 3 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 hugin-perl-5.18.patch

diff --git a/hugin-perl-5.18.patch b/hugin-perl-5.18.patch
new file mode 100644
index 0000000..ae0afaa
--- /dev/null
+++ b/hugin-perl-5.18.patch
@@ -0,0 +1,9 @@
+diff -urN hugin-2012.0.0.old/doc/deghosting_mask.pod hugin-2012.0.0/doc/deghosting_mask.pod
+--- hugin-2012.0.0.old/doc/deghosting_mask.pod	2013-07-26 11:27:55.907660500 +0200
++++ hugin-2012.0.0/doc/deghosting_mask.pod	2013-07-26 11:28:33.025657059 +0200
+@@ -1,3 +1,5 @@
++=encoding utf8
++
+ =head1 NAME
+ 
+ deghosting_mask - Creates mask for removing ghosting in images
diff --git a/hugin.changes b/hugin.changes
index 96671fa..ce6bc4f 100644
--- a/hugin.changes
+++ b/hugin.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jul 26 09:39:25 UTC 2013 - tchvatal@suse.com
+
+- Fix build with perl 5.18 by adding hugin-perl-5.18.patch
+- Remove old opensuse version conditionals as the package anyway
+  builds only on 12.3 and later, unresolvable on older ones.
+
 -------------------------------------------------------------------
 Mon Apr 22 20:34:16 UTC 2013 - dimstar@opensuse.org
 
diff --git a/hugin.spec b/hugin.spec
index c299984..1df2083 100644
--- a/hugin.spec
+++ b/hugin.spec
@@ -39,18 +39,13 @@ BuildRequires:  libpano-devel >= 2.9.18
 BuildRequires:  libtiff-devel
 BuildRequires:  libxml2
 BuildRequires:  python-devel
+BuildRequires:  python-wxWidgets >= 2.7.0
 BuildRequires:  swig
 BuildRequires:  tclap
 BuildRequires:  update-desktop-files
 BuildRequires:  vigra
-BuildRequires:  zip
-%if 0%{?suse_version} > 1130
-BuildRequires:  python-wxWidgets >= 2.7.0
 BuildRequires:  wxWidgets-devel
-%else
-BuildRequires:  python-wxGTK >= 2.7.0
-BuildRequires:  wxGTK-devel
-%endif
+BuildRequires:  zip
 %define mversion 2012.0
 Version:        %{mversion}.0
 Release:        0
@@ -63,14 +58,13 @@ 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:         %{name}-perl-5.18.patch
 Requires:       enblend-enfuse >= 3.2
 Recommends:     autopano-sift
 Recommends:     exiftool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} > 1130
 %define _use_internal_dependency_generator 0
 %define __find_requires %wx_requires
-%endif
 
 %description
 Hugin can be used to stitch multiple images together. The resulting
@@ -83,6 +77,7 @@ detection and extraction of key points.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # For SVN snapshot:
 #setup -q -n %%{name}
@@ -110,7 +105,7 @@ LIB_SUFFIX=%{_lib}
 LIB_SUFFIX=${LIB_SUFFIX#lib}
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON BUILD_HSI=ON .
 # parallel make kills our workers
-make -j1 VERBOSE=1
+make VERBOSE=1 %{?_smp_mflags} -j1
 
 %install
 %make_install
@@ -127,26 +122,14 @@ chmod -x %{buildroot}%{_docdir}/%{name}/*
 %fdupes %{buildroot}
 
 %post
-%if 0%{?suse_version} > 1130
-  %icon_theme_cache_post
-  %mime_database_post
-  %desktop_database_post
-%else
-  if test -f %{_bindir}/update-mime-database ; then
-    %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null
-  fi
-%endif
+%icon_theme_cache_post
+%mime_database_post
+%desktop_database_post
 
 %postun
-%if 0%{?suse_version} > 1130
-  %icon_theme_cache_postun
-  %mime_database_postun
-  %desktop_database_postun
-%else
-  if test -f %{_bindir}/update-mime-database ; then
-    %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null
-  fi
-%endif
+%icon_theme_cache_postun
+%mime_database_postun
+%desktop_database_postun
 
 %files -f %{name}.lang
 %defattr(-,root,root)