Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at Tue Mar 22 17:42:38 CET 2011. -------- --- hugin/hugin.changes 2010-12-28 17:19:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/hugin/hugin.changes 2011-03-22 08:15:26.000000000 +0100 @@ -1,0 +2,10 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- hugin-fix-gcc46.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.JsuznB/_old 2011-03-22 17:42:20.000000000 +0100 +++ /var/tmp/diff_new_pack.JsuznB/_new 2011-03-22 17:42:20.000000000 +0100 @@ -26,23 +26,24 @@ 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: 6 +Release: 11 Source: %{name}-%{version}.tar.bz2 # For SVN snapshot: # svn co https://hugin.svn.sourceforge.net/svnroot/hugin/hugin/trunk hugin #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 @@ %prep %setup -q %patch0 +%patch1 -p1 # For SVN snapshot: #setup -q -n %{name} # Rename Catalan in Spain to Catalan. @@ -115,12 +117,6 @@ 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 ++++++ hugin-fix-gcc46.patch ++++++ # 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" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org