diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 11c87b3..23d05b3 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -3,36 +3,25 @@ Version: 1.8.8 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}/oiio/archive/Release-%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/%{name}/oiio/archive/Release-%{version}/%{name}-%{version}.tar.gz # Images for test suite #Source1: oiio-images.tar.gz Patch0: OpenImageIO-man.patch -Patch1: OpenImageIO-dcmtk.patch -Patch2: OpenImageIO-as_needed.patch -Patch3: OpenImageIO-GLES.patch BuildRequires: cmake gcc-c++ BuildRequires: txt2man BuildRequires: qt5-devel -%if 0%{?rhel} && 0%{?rhel} < 7 -BuildRequires: boost148-devel -%else BuildRequires: boost-devel -%endif BuildRequires: glew-devel BuildRequires: OpenEXR-devel ilmbase-devel BuildRequires: python2-devel BuildRequires: libpng-devel libtiff-devel libjpeg-turbo-devel openjpeg2-devel BuildRequires: giflib-devel -%if ! 0%{?rhel} BuildRequires: libwebp-devel BuildRequires: Field3D-devel -%endif BuildRequires: hdf5-devel BuildRequires: dcmtk-devel BuildRequires: zlib-devel @@ -47,12 +36,6 @@ BuildRequires: openssl-devel # rebuilt. BuildRequires: OpenColorIO-devel -# We don't want to provide private python extension libs -%{?filter_setup: -%filter_provides_in %{python2_sitearch}/.*\.so$ -%filter_setup -} - %description OpenImageIO is a library for reading and writing images, and a bunch of related @@ -67,9 +50,9 @@ classes, utilities, and applications. Main features include: %package -n python2-openimageio -%{?python_provide:%python_provide python2-openimageio} Summary: Python 2 bindings for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +%{?python_provide:%python_provide python2-%{srcname}} %description -n python2-openimageio Python bindings for %{name}. @@ -95,7 +78,6 @@ with any formats for which plugins are available). %package devel Summary: Documentation for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -117,10 +99,6 @@ rm -rf src/include/tbb #rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images #tar --strip-components=1 -xzf %{SOURCE1} -# Do not override -std= !!! -sed -i \ --e 's,^\([ ]\+add_definitions.*-std=c++1.*\)$,# \1,' \ -CMakeLists.txt %build rm -rf build/linux && mkdir -p build/linux && pushd build/linux @@ -136,15 +114,9 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \ -DUSE_OPENSSL:BOOL=TRUE \ -DSTOP_ON_WARNING:BOOL=FALSE \ -%if 0%{?fedora} >= 26 -DUSE_CPP:STRING=14 \ -%endif %ifarch ppc ppc64 -DNOTHREADS:BOOL=FALSE \ -%endif -%if 0%{?rhel} && 0%{?rhel} < 7 - -DBOOST_INCLUDEDIR=%{_includedir}/boost148 \ - -DBOOST_LIBRARYDIR=%{_libdir}/boost148 \ %endif -DJPEG_INCLUDE_DIR=%{_includedir} \ -DOPENJPEG_INCLUDE_DIR=$(pkgconf --variable=includedir libopenjp2) \ @@ -163,10 +135,6 @@ mkdir -p %{buildroot}%{_mandir}/man1 cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1 -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig - - %check # Not all tests pass on linux #pushd build/linux && make test