From 1d9506e37a4497e3ef5ef21629d82139bee87bfb Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Feb 19 2017 15:37:46 +0000 Subject: Update to latest upstream release. Add patch per RHBZ#1412089 to prevent pulling in Qt5. --- diff --git a/.gitignore b/.gitignore index f55473e..46dfd88 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ clog /OpenImageIO-1.7.7.tar.gz /OpenImageIO-1.7.9.tar.gz /OpenImageIO-1.7.10.tar.gz +/OpenImageIO-1.7.11.tar.gz diff --git a/OpenImageIO-as_needed.patch b/OpenImageIO-as_needed.patch new file mode 100644 index 0000000..e9ca25f --- /dev/null +++ b/OpenImageIO-as_needed.patch @@ -0,0 +1,15 @@ +--- a/src/cmake/modules/FindOpenCV.cmake ++++ b/src/cmake/modules/FindOpenCV.cmake +@@ -51,9 +51,11 @@ + ) + + +-set (opencv_components opencv_highgui opencv_imgproc opencv_core) ++set (opencv_components opencv_imgproc opencv_core) + if (NOT ${OpenCV_VERSION} VERSION_LESS 3.0.0) + set (opencv_components opencv_videoio ${opencv_components}) ++else () ++ set (opencv_components opencv_highgui ${opencv_components}) + endif () + foreach (component ${opencv_components}) + find_library (${component}_lib diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 4cdf6ff..89d71d7 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -2,20 +2,21 @@ #global beta beta1 Name: OpenImageIO -Version: 1.7.10 -Release: 5%{?dist} +Version: 1.7.11 +Release: 1%{?dist} Summary: Library for reading and writing images Group: Development/Libraries License: BSD URL: https://sites.google.com/site/openimageio/home -Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/%{subname}/archive/Release-%{version}/%{name}-%{version}.tar.gz # Images for test suite #Source1: oiio-images.tar.gz Patch0: OpenImageIO-man.patch Patch1: OpenImageIO-uninit.patch +Patch2: OpenImageIO-as_needed.patch BuildRequires: cmake gcc-c++ BuildRequires: txt2man @@ -188,6 +189,10 @@ cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Sun Feb 19 2017 Richard Shaw - 1.7.11-1 +- Update to latest upstream release. +- Add patch per RHBZ#1412089 to prevent pulling in Qt5. + * Sun Feb 19 2017 Ralf Corsépius - 1.7.10-5 - Disable -Werror (Fix F26FTBFS, RHBZ#1424580). - Force USE_CPP14 on fedora >=26. diff --git a/sources b/sources index d6c6620..7be8762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (OpenImageIO-1.7.10.tar.gz) = b3884a534c87dec85a82736f482540a83a22f629d884c591b1683214038977aceb9cc9808bc683549aaad25987bec4e9f35a42cdd1b100aab76a6526ec8391b2 +SHA512 (OpenImageIO-1.7.11.tar.gz) = 1d6705f2f370d57a5d4ae75d5e4ce2c8efc709e2afa1c178a1b9bd3a7bfe4058bcfd8d52f445e0354c29a95c0d593c78fd812cff6064e20a0a08eadd9f3bc5da