X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=OpenColorIO.spec;h=aca6a0988e32284d10f4eab21ad906f8fe3a61bd;hb=d28eb96b6ee33155c850dc2c87b9caf7eaa006f5;hp=f57036835f1da42a34a12427fab4ff8070c34f98;hpb=d201374a3df55e62175cad437ba70743efa39fff;p=packages%2FOpenColorIO.git

diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index f570368..aca6a09 100644
--- a/OpenColorIO.spec
+++ b/OpenColorIO.spec
@@ -15,15 +15,17 @@
 Summary:	Complete color management solution
 Summary(pl.UTF-8):	Kompletny pakiet do zarządzania kolorami
 Name:		OpenColorIO
-Version:	1.0.6
-Release:	2
+Version:	1.0.9
+Release:	7
 License:	BSD
 Group:		Libraries
-Source0:	https://github.com/imageworks/OpenColorIO/tarball/v%{version}#/%{name}-%{version}.tar.gz
-# Source0-md5:	7bd5521d8671be9f9f92339b32497908
+Source0:	https://github.com/imageworks/OpenColorIO/tarball/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	ad3c4ea59c010a18d79276ab9d83af95
 Patch0:		%{name}-system-libs.patch
 Patch1:		%{name}-java.patch
 Patch2:		%{name}-libsuffix.patch
+Patch3:		%{name}-missing.patch
+Patch4:		%{name}-yaml-cpp.patch
 URL:		http://opencolorio.org/
 # g++ with tr1 support or...
 #BuildRequires:	boost-devel >= 1.34
@@ -32,7 +34,10 @@ BuildRequires:	cmake >= 2.8
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
-%{?with_docs:BuildRequires:	sphinx-pdg >= 1.1}
+%if %{with docs}
+BuildRequires:	sphinx-pdg >= 1.1
+BuildRequires:	texlive-latex-ams
+%endif
 BuildRequires:	tinyxml-devel >= 2.6.1
 BuildRequires:	yaml-cpp-devel >= 0.2.6
 %if %{with opengl}
@@ -155,10 +160,12 @@ Header file for PyOpenColorIO API.
 Plik nagłówkowy API PyOpenColorIO.
 
 %prep
-%setup -q -n imageworks-OpenColorIO-a16d9ac
+%setup -q -n imageworks-OpenColorIO-2b12063
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # required for cmake to find JNI headers/libs when lib64 is in use
@@ -173,7 +180,8 @@ cd build
 	-DOCIO_STATIC_JNIGLUE=OFF \
 %endif
 	%{!?with_sse2:-DOCIO_USE_SSE=OFF} \
-	-DPYTHON_INCLUDE_LIB_PREFIX=ON
+	-DUSE_EXTERNAL_TINYXML=ON \
+	-DUSE_EXTERNAL_YAML=ON
 
 %{__make}
 
@@ -183,10 +191,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# we use PYTHON_INCLUDE_LIB_PREFIX=ON so library is useful as C++ API
-# but allow it to be loaded without lib prefix
-ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libPyOpenColorIO.so.*.*.*) $RPM_BUILD_ROOT%{_libdir}/PyOpenColorIO.so
-
 # not needed when installing to /usr
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/ocio/setup_ocio.sh
 # packaged as %doc
@@ -216,6 +220,7 @@ rm -rf $RPM_BUILD_ROOT
 %files convert
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ocioconvert
+%attr(755,root,root) %{_bindir}/ociolutimage
 %endif
 
 %if %{with oiio} && %{with opengl}
@@ -242,16 +247,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libOpenColorIO-JNI.so.1
 %attr(755,root,root) %{_libdir}/libOpenColorIO-JNI.so
 %dir %{_datadir}/ocio
-%{_datadir}/ocio/OpenColorIO-1.0.6.jar
+%{_datadir}/ocio/OpenColorIO-%{version}.jar
 %endif
 
 %files -n python-OpenColorIO
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libPyOpenColorIO.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libPyOpenColorIO.so.1
-%attr(755,root,root) %{_libdir}/PyOpenColorIO.so
+%attr(755,root,root) %{py_sitedir}/PyOpenColorIO.so
 
 %files -n python-OpenColorIO-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libPyOpenColorIO.so
 %{_includedir}/PyOpenColorIO