|
@@ -1,8 +1,8 @@
|
|
%global subname oiio
|
|
%global subname oiio
|
|
|
|
|
|
Name: OpenImageIO
|
|
Name: OpenImageIO
|
|
-Version: 1.7.17
|
|
+Version: 1.7.19
|
|
-Release: 2%{?_dist_release}
|
|
+Release: 1%{?_dist_release}
|
|
Summary: Library for reading and writing images
|
|
Summary: Library for reading and writing images
|
|
|
|
|
|
Group: System Environment/Libraries
|
|
Group: System Environment/Libraries
|
|
@@ -39,7 +39,7 @@ BuildRequires: OpenColorIO-devel
|
|
|
|
|
|
# We don't want to provide private python extension libs
|
|
# We don't want to provide private python extension libs
|
|
%{?filter_setup:
|
|
%{?filter_setup:
|
|
-%filter_provides_in %{python_sitearch}/.*\.so$
|
|
+%filter_provides_in %{python_sitearch}/.*\.so$
|
|
%filter_setup
|
|
%filter_setup
|
|
}
|
|
}
|
|
|
|
|
|
@@ -95,12 +95,12 @@ Development files for package %{name}
|
|
%setup -q -n oiio-Release-%{version}
|
|
%setup -q -n oiio-Release-%{version}
|
|
|
|
|
|
# Remove bundled pugixml
|
|
# Remove bundled pugixml
|
|
-rm -f src/include/pugixml.hpp \
|
|
+%{__rm} -f src/include/pugixml.hpp \
|
|
- src/include/pugiconfig.hpp \
|
|
+ src/include/pugiconfig.hpp \
|
|
- src/libutil/pugixml.cpp
|
|
+ src/libutil/pugixml.cpp
|
|
|
|
|
|
# Remove bundled tbb
|
|
# Remove bundled tbb
|
|
-rm -rf src/include/tbb
|
|
+%{__rm} -rf src/include/tbb
|
|
|
|
|
|
# Install test images
|
|
# Install test images
|
|
#rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images
|
|
#rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images
|
|
@@ -108,7 +108,7 @@ rm -rf src/include/tbb
|
|
|
|
|
|
|
|
|
|
%build
|
|
%build
|
|
-rm -rf build/linux && mkdir -p build/linux && pushd build/linux
|
|
+%{__rm} -rf build/linux && mkdir -p build/linux && pushd build/linux
|
|
# CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
|
|
# CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes
|
|
# CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
|
|
# CMAKE_INSTALL_RPATH to be cleared, which is the desiered result.
|
|
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
|
@@ -125,20 +125,20 @@ rm -rf build/linux && mkdir -p build/linux && pushd build/linux
|
|
-DVERBOSE=TRUE \
|
|
-DVERBOSE=TRUE \
|
|
../../
|
|
../../
|
|
|
|
|
|
-make %{?_smp_mflags}
|
|
+%{__make} %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
|
%install
|
|
%install
|
|
pushd build/linux
|
|
pushd build/linux
|
|
-make DESTDIR=%{buildroot} install
|
|
+%{make_install}
|
|
|
|
+popd
|
|
|
|
|
|
# # Move man pages to the right directory
|
|
# # Move man pages to the right directory
|
|
# mkdir -p %{buildroot}%{_mandir}/man1
|
|
# mkdir -p %{buildroot}%{_mandir}/man1
|
|
# cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
|
|
# cp -a src/doc/*.1 %{buildroot}%{_mandir}/man1
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
+%post -p %{_syssbindir}/ldconfig
|
|
-%postun -p /sbin/ldconfig
|
|
+%postun -p %{_syssbindir}/ldconfig
|
|
-
|
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
%files
|
|
@@ -167,6 +167,10 @@ make DESTDIR=%{buildroot} install
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Aug 24 2018 Toshiaki Ara <ara_t@384.jp> 1.7.19-3
|
|
|
|
+- update to 1.7.19
|
|
|
|
+- using macro
|
|
|
|
+
|
|
* Sat Aug 04 2018 Toshiaki Ara <ara_t@384.jp> 1.7.17-2
|
|
* Sat Aug 04 2018 Toshiaki Ara <ara_t@384.jp> 1.7.17-2
|
|
- rebuild with hdf5-1.8.20
|
|
- rebuild with hdf5-1.8.20
|
|
|
|
|