Hello community, here is the log from the commit of package hugin for openSUSE:Factory checked in at 2013-07-26 15:56:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hugin (Old) and /work/SRC/openSUSE:Factory/.hugin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hugin" Changes: -------- --- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2013-04-24 12:23:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hugin.new/hugin.changes 2013-07-26 15:56:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 26 09:39:25 UTC 2013 - tchvatal@suse.com + +- Fix build with perl 5.18 by adding hugin-perl-5.18.patch +- Remove old opensuse version conditionals as the package anyway + builds only on 12.3 and later, unresolvable on older ones. + +------------------------------------------------------------------- New: ---- hugin-perl-5.18.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hugin.spec ++++++ --- /var/tmp/diff_new_pack.f8iRAK/_old 2013-07-26 15:56:58.000000000 +0200 +++ /var/tmp/diff_new_pack.f8iRAK/_new 2013-07-26 15:56:58.000000000 +0200 @@ -39,18 +39,13 @@ BuildRequires: libtiff-devel BuildRequires: libxml2 BuildRequires: python-devel +BuildRequires: python-wxWidgets >= 2.7.0 BuildRequires: swig BuildRequires: tclap BuildRequires: update-desktop-files BuildRequires: vigra -BuildRequires: zip -%if 0%{?suse_version} > 1130 -BuildRequires: python-wxWidgets >= 2.7.0 BuildRequires: wxWidgets-devel -%else -BuildRequires: python-wxGTK >= 2.7.0 -BuildRequires: wxGTK-devel -%endif +BuildRequires: zip %define mversion 2012.0 Version: %{mversion}.0 Release: 0 @@ -63,14 +58,13 @@ # 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?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 @@ -83,6 +77,7 @@ %prep %setup -q +%patch0 -p1 # For SVN snapshot: #setup -q -n %%{name} @@ -110,7 +105,7 @@ LIB_SUFFIX=${LIB_SUFFIX#lib} cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX -DENABLE_LAPACK=ON BUILD_HSI=ON . # parallel make kills our workers -make -j1 VERBOSE=1 +make VERBOSE=1 %{?_smp_mflags} -j1 %install %make_install @@ -127,26 +122,14 @@ %fdupes %{buildroot} %post -%if 0%{?suse_version} > 1130 - %icon_theme_cache_post - %mime_database_post - %desktop_database_post -%else - if test -f %{_bindir}/update-mime-database ; then - %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null - fi -%endif +%icon_theme_cache_post +%mime_database_post +%desktop_database_post %postun -%if 0%{?suse_version} > 1130 - %icon_theme_cache_postun - %mime_database_postun - %desktop_database_postun -%else - if test -f %{_bindir}/update-mime-database ; then - %{_bindir}/update-mime-database %{_datadir}/mime >/dev/null - fi -%endif +%icon_theme_cache_postun +%mime_database_postun +%desktop_database_postun %files -f %{name}.lang %defattr(-,root,root) ++++++ hugin-perl-5.18.patch ++++++ 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 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org