From ae7e3511a9b4521acf8f781339f5daaa6d6858dc3d45bfcc9913d9029559f6f4 Mon Sep 17 00:00:00 2001 From: Togan Muftuoglu Date: Fri, 25 Oct 2013 17:20:00 +0000 Subject: [PATCH 1/2] Accepting request 204827 from home:sbrabec:branches:graphics Intended for 13.1 as well. - Work around missing RPATH (bnc#846944). OBS-URL: https://build.opensuse.org/request/show/204827 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=50 --- hugin.changes | 5 +++++ hugin.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/hugin.changes b/hugin.changes index 1ca8641..db91496 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 25 17:36:26 CEST 2013 - sbrabec@suse.cz + +- Work around missing RPATH (bnc#846944). + ------------------------------------------------------------------- Sat Aug 10 09:33:02 UTC 2013 - tchvatal@suse.com diff --git a/hugin.spec b/hugin.spec index ddb581a..0f7daea 100644 --- a/hugin.spec +++ b/hugin.spec @@ -101,6 +101,8 @@ rm README_JP.new export PATH=$PWD/bin:$PATH export CFLAGS="%{optflags}" export CXXFLAGS="$CFLAGS" +# FIXME: This is an ugly hack. Build system should be fixed instead! Remove as soon as upstream fixes it (bnc#846944). +export LDFLAGS="-Wl,-rpath -Wl,%{_libdir}/hugin" LIB_SUFFIX=%{_lib} LIB_SUFFIX=${LIB_SUFFIX#lib} cmake \ From e35e2e1e34bb40bde3cdb407accabd16ff33b87440891d1a60490103bb01f8a7 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 28 Oct 2013 12:50:05 +0000 Subject: [PATCH 2/2] Accepting request 204973 from home:sergeyopensuse:misc - Updated to version 2013.0.0. - Removed hugin-perl-5.18.patch (included upstream). OBS-URL: https://build.opensuse.org/request/show/204973 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=51 --- hugin-2012.0.0.tar.bz2 | 3 --- hugin-2013.0.0.tar.bz2 | 3 +++ hugin-perl-5.18.patch | 9 --------- hugin.changes | 11 +++++++++++ hugin.spec | 4 +--- 5 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 hugin-2012.0.0.tar.bz2 create mode 100644 hugin-2013.0.0.tar.bz2 delete mode 100644 hugin-perl-5.18.patch diff --git a/hugin-2012.0.0.tar.bz2 b/hugin-2012.0.0.tar.bz2 deleted file mode 100644 index 3415301..0000000 --- a/hugin-2012.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63dfd88ac90d3af4b958111db951bb7fbf2c66ad6b0246e6305403eb5de971b3 -size 11658665 diff --git a/hugin-2013.0.0.tar.bz2 b/hugin-2013.0.0.tar.bz2 new file mode 100644 index 0000000..5e22ccd --- /dev/null +++ b/hugin-2013.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:484e1ed58fa6fe4bae1f423967101549345bcca2653b992afbc0ed9ec0dbebd5 +size 11247583 diff --git a/hugin-perl-5.18.patch b/hugin-perl-5.18.patch deleted file mode 100644 index ae0afaa..0000000 --- a/hugin-perl-5.18.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 db91496..90aa489 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Oct 28 06:05:31 UTC 2013 - salsergey@gmail.com + +- Updated to version 2013.0.0: + * Redesign of the (Graphical) User Interface (GUI). The user interface now consists of three modes: Simple, Advanced and Expert. + * New tool pto_var ( change image variables inside pto files). + * New tool pto_lensstack (modify assigned lenses and stack in pto files). + * New tool geocpset (set/add geometric constraints for multirow panorama with featureless images). + * Many more improvements and bug fixes. +- Removed hugin-perl-5.18.patch (included upstream). + ------------------------------------------------------------------- Fri Oct 25 17:36:26 CEST 2013 - sbrabec@suse.cz diff --git a/hugin.spec b/hugin.spec index 0f7daea..3df164d 100644 --- a/hugin.spec +++ b/hugin.spec @@ -46,7 +46,7 @@ BuildRequires: update-desktop-files BuildRequires: vigra BuildRequires: wxWidgets-devel BuildRequires: zip -%define mversion 2012.0 +%define mversion 2013.0 Version: %{mversion}.0 Release: 0 Summary: Toolchain for Stitching of Images and Creating Panoramas @@ -58,7 +58,6 @@ 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 @@ -77,7 +76,6 @@ detection and extraction of key points. %prep %setup -q -%patch0 -p1 # For SVN snapshot: #setup -q -n %%{name}