- updated to 2.6.1.1

diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index e1d86a0210788dacf053ca3227318996972dcc5a..ee60850ed3234de0987a53470f21475b5a167bd3 100644 (file)
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -1,6 +1,7 @@
 #
 # Conditional build:
-%bcond_with    sse2    # SSE2 instructions
+%bcond_with    sse2            # SSE2 instructions
+%bcond_without qtwebengine     # Qt5WebKit instead of Qt5WebEngine
 
 %ifarch pentium4 %{x8664} x32
 %define        with_sse2       1
@@ -8,12 +9,12 @@
 Summary:       Luminance HDR - HDR Image compositor
 Summary(pl.UTF-8):     Luminance HDR - narzędzie do składania obrazów HDR
 Name:          luminance-hdr
-Version:       2.6.0
-Release:       6
+Version:       2.6.1.1
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications/Graphics
-Source0:       http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
-# Source0-md5: 9ac2be847d304f0ddc7089b251825c4d
+Source0:       https://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
+# Source0-md5: c57baf1d3c5d7952f952496f20f86c8f
 Patch0:                buildtype.patch
 Patch1:                sse_header.patch
 URL:           http://qtpfsgui.sourceforge.net/
@@ -27,14 +28,14 @@ BuildRequires:      Qt5Network-devel >= 5
 BuildRequires: Qt5PrintSupport-devel >= 5
 BuildRequires: Qt5Sql-devel >= 5
 BuildRequires: Qt5Svg-devel >= 5
-# without qtwebkit patch uses Qt5WebEngine instead of Qt5WebKit
-#BuildRequires:        Qt5WebEngine-devel >= 5
-BuildRequires: Qt5WebKit-devel >= 5
+%{?with_qtwebengine:BuildRequires:     Qt5WebEngine-devel >= 5}
+%{!?with_qtwebengine:BuildRequires:    Qt5WebKit-devel >= 5}
 BuildRequires: Qt5Widgets-devel >= 5
 BuildRequires: Qt5Xml-devel >= 5
 BuildRequires: boost-devel
 BuildRequires: cfitsio-devel
-BuildRequires: cmake >= 2.8.11
+BuildRequires: cmake >= 3.3
+BuildRequires: eigen3
 BuildRequires: exiv2-devel >= 0.21
 BuildRequires: fftw3-single-devel >= 3
 BuildRequires: gcc-c++ >= 6:4.3
@@ -51,13 +52,14 @@ BuildRequires:      qt5-linguist >= 5
 BuildRequires: qt5-qmake >= 5
 BuildRequires: rpmbuild(macros) >= 1.605
 BuildRequires: sed >= 4.0
+%{!?with_qtwebengine:BuildConflicts:   Qt5WebEngine-devel}
 Requires(post,postun): gtk-update-icon-cache
 Requires:      OpenEXR >= 2.0.1
 Requires:      Qt5Gui-platform-xcb
 Requires:      Qt5Sql-sqldriver-sqlite3
 Requires:      exiv2-libs >= 0.21
 Requires:      hicolor-icon-theme
-Obsoletes:     qtpfsgui
+Obsoletes:     qtpfsgui < 2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -72,7 +74,7 @@ Luminance HDR - narzędzie do składania obrazów HDR.
 %patch1 -p1
 
 %build
-mkdir build
+install -d build
 cd build
 %if %{with sse2}
 CXXFLAGS="%{rpmcxxflags} -msse2 -DLUMINANCE_USE_SSE=1"