From 853d06f7402cca78f13b1a8d01f6f39656546293a261fefbcc9da1c2aee8e5a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Mar 2011 20:08:04 +0000 Subject: [PATCH 1/2] Accepting request 64704 from home:coolo:nolicenses OBS-URL: https://build.opensuse.org/request/show/64704 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=14 --- hugin.changes | 5 +++++ hugin.spec | 21 +++++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/hugin.changes b/hugin.changes index b1b67b0..aac5aab 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 21 16:51:59 UTC 2011 - coolo@novell.com + +- licenses package is about to die + ------------------------------------------------------------------- Tue Dec 28 17:18:26 CET 2010 - sbrabec@suse.cz diff --git a/hugin.spec b/hugin.spec index 9743cd5..573d0e5 100644 --- a/hugin.spec +++ b/hugin.spec @@ -1,7 +1,7 @@ # -# spec file for package hugin (Version 2010.0.0) +# spec file for package hugin # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,19 +21,18 @@ Name: hugin 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 +BuildRequires: python-wxWidgets wxWidgets-devel %else -BuildRequires: wxGTK-devel python-wxGTK +BuildRequires: python-wxGTK wxGTK-devel %endif %if %suse_version > 1020 -BuildRequires: fdupes licenses -Requires: licenses +BuildRequires: fdupes %endif License: GPLv2+ Group: Productivity/Graphics/Other Summary: Toolchain for Stitching of Images and Creating Panoramas Version: 2010.0.0 -Release: 3 +Release: 6 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin @@ -42,7 +41,7 @@ Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: licenses make +Requires: make # Optional package, if missing, it could cause unexpected errors: Requires: enblend-enfuse >= 3.2 # Optional third party package: @@ -115,12 +114,6 @@ make %{?jobs:-j%jobs} mv $RPM_BUILD_ROOT%{_datadir}/icons/gnome $RPM_BUILD_ROOT%{_datadir}/icons/hicolor %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{_datadir} -for FILE in COPYING LICENCE LICENCE_JHEAD LICENCE_VIGRA ; do - MD5SUM=$(md5sum $FILE | sed 's/ .*//') - if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then - ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE - fi -done %endif %clean From f85e0ff120b1635e4c6a15f2b3dcdec461a739476655535dde545e794cc0d315 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 22 Mar 2011 09:15:10 +0000 Subject: [PATCH 2/2] Accepting request 64798 from home:namtrac:branches:graphics OBS-URL: https://build.opensuse.org/request/show/64798 OBS-URL: https://build.opensuse.org/package/show/graphics/hugin?expand=0&rev=15 --- hugin-fix-gcc46.patch | 20 ++++++++++++++++++++ hugin.changes | 5 +++++ hugin.spec | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 hugin-fix-gcc46.patch diff --git a/hugin-fix-gcc46.patch b/hugin-fix-gcc46.patch new file mode 100644 index 0000000..97f3752 --- /dev/null +++ b/hugin-fix-gcc46.patch @@ -0,0 +1,20 @@ + +# HG changeset patch +# User Bruno Postle +# Date 1295990053 0 +# Node ID 1fc6ad6e7c7ae679e3b8f96b6f4c36920f228138 +# Parent 9e1d0816a1edd95a985ad6fd62da9c8b7342efb5 +Fix for compilation with gcc-4.6.0 + +diff -r 9e1d0816a1ed -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx +--- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jan 24 21:37:53 2011 +0100 ++++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 +@@ -41,6 +41,7 @@ + #define VIGRA_MULTI_ITERATOR_HXX + + #include ++#include + #include "tinyvector.hxx" + #include "iteratortags.hxx" + + diff --git a/hugin.changes b/hugin.changes index aac5aab..a383fe3 100644 --- a/hugin.changes +++ b/hugin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 22 08:12:00 UTC 2011 - idoenmez@novell.com + +- Add hugin-fix-gcc46.patch: fix gcc 4.6 compilation + ------------------------------------------------------------------- Mon Mar 21 16:51:59 UTC 2011 - coolo@novell.com diff --git a/hugin.spec b/hugin.spec index 573d0e5..2296014 100644 --- a/hugin.spec +++ b/hugin.spec @@ -39,6 +39,8 @@ Source: %{name}-%{version}.tar.bz2 #Source: %{name}-svn2008xxxx.tar.bz2 Source1: %{name}-svn-dummy Patch0: hugin-libpng14.patch +# PATCH-FIX-UPSTREAM hugin-fix-gcc46.patch idoenmez@suse.de -- Fix compilation with gcc 4.6 +Patch1: hugin-fix-gcc46.patch Url: http://hugin.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: make @@ -79,6 +81,7 @@ Authors: %prep %setup -q %patch0 +%patch1 -p1 # For SVN snapshot: #setup -q -n %{name} # Rename Catalan in Spain to Catalan.