X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=OpenColorIO.spec;h=c0976a4e23e1f21ed427958b616bada23aa8d82f;hb=68f4aba6a2b0903c421d24833129f6835939f036;hp=8a31a040e169cffcbedcd50fb33ee5402e121ba1;hpb=1ebfdec0afc380f96f9f878d9fa79b13da8297ea;p=packages%2FOpenColorIO.git

diff --git a/OpenColorIO.spec b/OpenColorIO.spec
index 8a31a04..c0976a4 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:	1
+Version:	1.0.8
+Release:	3
 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:	9838f5f1cf624a3d1253241f22e2179a
 Patch0:		%{name}-system-libs.patch
 Patch1:		%{name}-java.patch
 Patch2:		%{name}-libsuffix.patch
+# for yaml-cpp 0.5.0 (unfinished)
+Patch3:		%{name}-yaml-cpp.patch
 URL:		http://opencolorio.org/
 # g++ with tr1 support or...
 #BuildRequires:	boost-devel >= 1.34
@@ -32,9 +34,13 @@ 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
+BuildRequires:	yaml-cpp-devel < 0.4.0
 %if %{with opengl}
 BuildRequires:	OpenGL-devel
 BuildRequires:	OpenGL-glut-devel
@@ -155,7 +161,7 @@ Header file for PyOpenColorIO API.
 Plik nagłówkowy API PyOpenColorIO.
 
 %prep
-%setup -q -n imageworks-OpenColorIO-a16d9ac
+%setup -q -n imageworks-OpenColorIO-8883824
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -173,7 +179,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 +190,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
@@ -242,16 +245,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