Hello community,
here is the log from the commit of package hugin for openSUSE:Factory checked in at 2019-02-04 14:26:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hugin (Old)
and /work/SRC/openSUSE:Factory/.hugin.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hugin"
Mon Feb 4 14:26:03 2019 rev:60 rq:671001 version:2018.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/hugin/hugin.changes 2019-02-01 11:45:55.396523038 +0100
+++ /work/SRC/openSUSE:Factory/.hugin.new.28833/hugin.changes 2019-02-04 14:26:10.609032014 +0100
@@ -1,0 +2,7 @@
+Wed Jan 30 19:17:03 UTC 2019 - Stefan Brüns
+
+- spec file cleanup (%license, %defattr)
+- add HSI (Hugin Scripting Interface) bcond, correct -DBUILD_HSI
+ option syntax for cmake
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hugin.spec ++++++
--- /var/tmp/diff_new_pack.Fy7FE5/_old 2019-02-04 14:26:11.477031602 +0100
+++ /var/tmp/diff_new_pack.Fy7FE5/_new 2019-02-04 14:26:11.481031600 +0100
@@ -1,7 +1,7 @@
#
# spec file for package hugin
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,10 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+%bcond_with hsi
+
Name: hugin
BuildRequires: Mesa-devel
BuildRequires: OpenEXR-devel
@@ -25,7 +27,7 @@
%else
BuildRequires: boost-devel
%endif
-BuildRequires: cmake >= 2.8.12
+BuildRequires: cmake >= 3.1.0
BuildRequires: desktop-file-utils
BuildRequires: exiftool
BuildRequires: fdupes
@@ -34,8 +36,6 @@
BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: lapack
-BuildRequires: libXi-devel
-BuildRequires: libXmu-devel
BuildRequires: libexiv2-devel
BuildRequires: libjpeg-devel
BuildRequires: liblapack3
@@ -43,7 +43,9 @@
BuildRequires: libpano-devel >= 2.9.19
BuildRequires: libtiff-devel
BuildRequires: libxml2
+%if %{with hsi}
BuildRequires: python-wxWidgets >= 3
+%endif
BuildRequires: sqlite3-devel
BuildRequires: swig
BuildRequires: update-desktop-files
@@ -54,7 +56,7 @@
Version: 2018.0.0
Release: 0
Summary: Toolchain for Stitching of Images and Creating Panoramas
-License: GPL-2.0+
+License: GPL-2.0-or-later
Group: Productivity/Graphics/Other
Url: http://hugin.sourceforge.net/
Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{mversion}/%{name}-%{version}.tar.bz2
@@ -90,6 +92,8 @@
%patch0
%patch1 -p1
+chmod -x AUTHORS authors.txt Changes.txt README TODO COPYING.txt
+
# For SVN snapshot:
#setup -q -n %%{name}
# Rename Catalan in Spain to Catalan (translation removed in version 2014.0.0).
@@ -110,21 +114,19 @@
export CXXFLAGS="$CFLAGS"
# FIXME: This is an ugly hack. Build system should be fixed instead! Remove as soon as upstream fixes it (bnc#846944).
export LDFLAGS="-Wl,-rpath -Wl,%{_libdir}/hugin"
-LIB_SUFFIX=%{_lib}
-LIB_SUFFIX=${LIB_SUFFIX#lib}
-mkdir build && cd build
-cmake \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=$LIB_SUFFIX \
- -DENABLE_LAPACK=ON BUILD_HSI=ON \
+
+%cmake \
+ -DENABLE_LAPACK=ON \
+ -DBUILD_HSI=%{?with_hsi:ON}%{!?with_hsi:OFF} \
..
# parallel make kills our workers
make VERBOSE=1 %{?_smp_mflags} -j1
%install
-cd build
-%make_install
-cd ..
+pushd .
+%cmake_install
+
+popd
%suse_update_desktop_file hugin 2DGraphics
%suse_update_desktop_file PTBatcherGUI 2DGraphics
%suse_update_desktop_file calibrate_lens_gui 2DGraphics
@@ -132,9 +134,8 @@
%{find_lang} %{name}
# Use better place for MIME icons.
mv -f %{buildroot}%{_datadir}/icons/gnome %{buildroot}%{_datadir}/icons/hicolor
-mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -a AUTHORS authors.txt COPYING.txt Changes.txt README TODO %{buildroot}%{_docdir}/%{name}/
-chmod -x %{buildroot}%{_docdir}/%{name}/*
+# Install manually so it can be dedup'ed with the one in the program resources
+install -m644 -D -t %{buildroot}%{_licensedir}/hugin/ COPYING.txt
%fdupes %{buildroot}
%post
@@ -148,8 +149,8 @@
%desktop_database_postun
%files -f %{name}.lang
-%defattr(-,root,root)
-%doc %{_docdir}/%{name}
+%license COPYING.txt
+%doc AUTHORS authors.txt Changes.txt README TODO
%{_bindir}/*
%{_datadir}/hugin
%{_datadir}/applications/*.desktop