rpm/hugin
SHA256
1
0
Fork 0
forked from pool/hugin
Code Pull Requests Activity

Accepting request 64804 from graphics

Browse Source 
Accepted submit request 64804 from user licensedigger

OBS-URL: https://build.opensuse.org/request/show/64804
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hugin?expand=0&rev=27
This commit is contained in:
Sascha Peilicke 2011-03-22 16:42:38 +00:00 committed by Git OBS Bridge
commit d8faafb443
3 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hugin-fix-gcc46.patch Normal file
View File

@ -0,0 +1,20 @@
# HG changeset patch
# User Bruno Postle <bruno@postle.net>
# 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 <sys/types.h>
+#include <stddef.h>
#include "tinyvector.hxx"
#include "iteratortags.hxx"

10
hugin.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- licenses package is about to die
-------------------------------------------------------------------
Tue Dec 28 17:18:26 CET 2010 - sbrabec@suse.cz

14
hugin.spec
View File

@ -26,8 +26,7 @@ BuildRequires: python-wxWidgets wxWidgets-devel
BuildRequires: python-wxGTK wxGTK-devel
%endif
%if %suse_version > 1020
BuildRequires: fdupes licenses
Requires: licenses
BuildRequires: fdupes
%endif
License: GPLv2+
Group: Productivity/Graphics/Other
@ -40,9 +39,11 @@ 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: licenses make
Requires: make
# Optional package, if missing, it could cause unexpected errors:
Requires: enblend-enfuse >= 3.2
# Optional third party package:
@ -80,6 +81,7 @@ Authors:
%prep
%setup -q
%patch0
%patch1 -p1
# For SVN snapshot:
#setup -q -n %{name}
# Rename Catalan in Spain to Catalan.
@ -115,12 +117,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