From 2a01e1a3fc05292faa02cf80f6c719b5d75fb28965da0c65e5f4e7b5dc45a6e3 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 28 Apr 2010 11:47:47 +0000 Subject: [PATCH 1/3] - added make to Requires [bnc#596664] OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=10 --- hugin.changes | 5 +++++ hugin.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hugin.changes b/hugin.changes index 69992e4..ab3af13 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 28 13:43:02 CEST 2010 - pgajdos@suse.cz + +- added make to Requires [bnc#596664] + ------------------------------------------------------------------- Tue Apr 20 10:13:59 CEST 2010 - davejplater@gmail.com diff --git a/hugin.spec b/hugin.spec index fc3fd70..c063c2c 100644 --- a/hugin.spec +++ b/hugin.spec @@ -37,7 +37,7 @@ Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses +Requires: licenses make # Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 # Optional third party package: From ec6de17131f5a86ea4ba61fc7aa26632b59c504035f48fc750afb5f48da9e898 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 28 Apr 2010 20:52:29 +0000 Subject: [PATCH 2/3] Accepting request 39000 from graphics checked in (request 39000) OBS-URL: https://build.opensuse.org/request/show/39000 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=11 --- hugin.changes | 5 ----- hugin.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/hugin.changes b/hugin.changes index ab3af13..69992e4 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Apr 28 13:43:02 CEST 2010 - pgajdos@suse.cz - -- added make to Requires [bnc#596664] - ------------------------------------------------------------------- Tue Apr 20 10:13:59 CEST 2010 - davejplater@gmail.com diff --git a/hugin.spec b/hugin.spec index c063c2c..fc3fd70 100644 --- a/hugin.spec +++ b/hugin.spec @@ -37,7 +37,7 @@ Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses make +Requires: licenses # Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 # Optional third party package: From 49e55b60f9fd604b593e65060cdc2e5a353012bb3bcc11d11c8ed9d101a8125a Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Mon, 17 Jan 2011 13:59:16 +0000 Subject: [PATCH 3/3] Accepting request 58507 from home:sbrabec:branches:X11:wxWidgets Accepted my own submit. OBS-URL: https://build.opensuse.org/request/show/58507 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=12 --- hugin.changes | 10 ++++++++++ hugin.spec | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/hugin.changes b/hugin.changes index 69992e4..b1b67b0 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Dec 28 17:18:26 CET 2010 - sbrabec@suse.cz + +- Compile with wxWidgets (STL variant). + +------------------------------------------------------------------- +Wed Apr 28 13:43:02 CEST 2010 - pgajdos@suse.cz + +- added make to Requires [bnc#596664] + ------------------------------------------------------------------- Tue Apr 20 10:13:59 CEST 2010 - davejplater@gmail.com diff --git a/hugin.spec b/hugin.spec index fc3fd70..9743cd5 100644 --- a/hugin.spec +++ b/hugin.spec @@ -19,7 +19,12 @@ Name: hugin -BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel libxml2 python-wxGTK update-desktop-files vigra wxGTK-devel zip +BuildRequires: OpenEXR-devel SDL-devel boost-devel cmake fftw3-devel freeglut-devel gcc-c++ glew-devel libexiv2-devel libpano-devel libxml2 update-desktop-files vigra zip +%if %suse_version > 1130 +BuildRequires: wxWidgets-devel python-wxWidgets +%else +BuildRequires: wxGTK-devel python-wxGTK +%endif %if %suse_version > 1020 BuildRequires: fdupes licenses Requires: licenses @@ -28,7 +33,7 @@ License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2010.0.0 -Release: 2 +Release: 3 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin @@ -37,11 +42,15 @@ Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses +Requires: licenses make # Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 # Optional third party package: Recommends: autopano-sift exiftool +%if %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