From 5b7745c11d4d5aab907f57a80c4c62bd1a101ad3 Mon Sep 17 00:00:00 2001
From: Luya Tshimbalanga <luya@fedoraproject.org>
Date: Jun 27 2019 05:46:01 +0000
Subject: Append Python3 declaration on cmake invocation


---

diff --git a/.gitignore b/.gitignore
index 5a08931..395be69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /Blender-Exporter-3.2.0.tar.gz
 /Blender-Exporter-3.3.0.tar.gz
 /Core-3.3.0.tar.gz
+/Blender-Exporter-943be3f.tar.gz
+/Core-67f6586.tar.gz
diff --git a/YafaRay.spec b/YafaRay.spec
index 151054b..3cce27e 100644
--- a/YafaRay.spec
+++ b/YafaRay.spec
@@ -1,8 +1,9 @@
-#%%global	commit0 60452c5586772bcf2eccc47ed5fa9b2930c685b8
-#%%global	commit1 b521835148d1cd77bcad0f64a989ff47934b9ffc
-#%%global	shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
-#%%global	shortcommit1 %%(c=%%{commit1}; echo ${c:0:7})
-#%%global	date 20170221
+%global	commit0 67f658698ad46d9cc0b69288782aa2ffe4c8bcf1
+%global	commit1 943be3f2a3f26a6b1bbde944347921c85a98af3d
+%global	shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global	shortcommit1 %(c=%{commit1}; echo ${c:0:7})
+%global	snapshot 1
+%global	date 20190223
 %global debug_package %{nil}
 %global	yname yafaray
 %global	alphatag beta
@@ -15,7 +16,7 @@ License:	LGPLv2+
 Summary:	A free open-source ray-tracing render engine
 Version:	3.3.0
 URL:		http://www.yafaray.org/
-Release:	17%{?date:.%{date}git}%{?dist}
+Release:	18%{?date:.%{date}git}%{?dist}
 
 # Comment source release and use git snapshot instead as suggested by upstream
 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/ZQTGNFJFTXHWWPYED44NVK3PLCUTGG6B/
@@ -37,19 +38,20 @@ BuildRequires:	blender-rpm-macros
 BuildRequires:	boost-devel
 BuildRequires:	cmake
 BuildRequires:	gcc-c++
-BuildRequires:	git
-BuildRequires:	freetype-devel
+#BuildRequires:	git
 BuildRequires:	libappstream-glib
 BuildRequires:	libjpeg-devel 
-BuildRequires:	libpng-devel
-BuildRequires:	libtiff-devel
 BuildRequires:	libxml2-devel 
 BuildRequires:	opencv-devel
 BuildRequires:	OpenEXR-devel >= 1.2 
+BuildRequires:	pkgconfig(freetype2)
+BuildRequires:	pkgconfig(libpng)
+BuildRequires:	pkgconfig(libtiff-4)
+BuildRequires:	pkgconfig(Qt5)
+BuildRequires:	pkgconfig(zlib)
 BuildRequires:	python3-devel
-BuildRequires:	qt-devel
 BuildRequires:	swig
-BuildRequires:	zlib-devel 
+
 
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 # Set exclusive arch
@@ -84,7 +86,7 @@ parameters. This settings interface is launched by an entry automatically
 added to the Blender Render menu.
 
 %prep
-%if 0%{?shortcommit0}
+%if %{snapshot}
 %autosetup -D -n Core-%{commit0}
 %autosetup -D -T -a 1 -n Core-%{commit0}
 
@@ -102,7 +104,7 @@ sed -i 's|metaclass=RNAMeta|metaclass.RNAMeta|' Blender-Exporter-%{version}/ot/%
 
 sed -i -e 's|set(YAF_LIB_DIR lib)|set(YAF_LIB_DIR %{_lib})|g' CMakeLists.txt
 sed -i -e 's|set(YAF_TARGET_TYPE ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib RUNTIME)|\
-    set(YAF_TARGET_TYPE ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/%{_lib} RUNTIME)|g' CMakeLists.txt
+    set(YAF_TARGET_TYPE ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}%{_lib} RUNTIME)|g' CMakeLists.txt
 
 # Set proper permission per packaging guideline
 find . -name "*.h" -exec chmod 644 {} \;
@@ -116,6 +118,8 @@ find . -name "*.cc" -exec chmod 644 {} \;
 	-DDEBUG_BUILD=OFF \
 	-DWITH_QT=ON \
 	-DUSER_DBGFLAGS="%{optflags} -O3 -ffast-math" \
+	-DYAF_PY_VERSION="%{python3_version}" \
+	-DYAF_BINDINGS_PY_DIR="%{python3_sitearch}" \
 	.
 
 %make_build VERBOSE=1
@@ -131,7 +135,7 @@ rm -fr %{buildroot}%{_docdir}/%{yname}
 # Install add-on on Blender directory
 mkdir -p %{buildroot}%{blender_addons}/%{yname}
 
-%if 0%{?shortcommit0}
+%if %{snapshot}
 cp -pR Blender-Exporter-%{commit1}/* \
   %{buildroot}%{blender_addons}/%{yname}
 %else
@@ -153,6 +157,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{yname}
 %doc AUTHORS CHANGELOG README
 %{_bindir}/%{yname}-xml
 %{_datadir}/%{yname}/*
+%{python3_sitearch}/*
 
 %files lib
 %{_includedir}/%{yname}/
@@ -166,6 +171,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{yname}
 %{blender_addons}/%{yname}/*
 
 %changelog
+* Fri Jun 21 2019 Luya Tshimbalanga <luya@fedoraproject.org> - 3.3.0-18
+- Append Python3 declaration on cmake invocation
+
 * Fri Apr 12 2019 Richard Shaw <hobbes1069@gmail.com> - 3.3.0-17
 - Rebuild for OpenEXR 2.3.0.
 
diff --git a/sources b/sources
index 4301caf..0c47dd7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (Blender-Exporter-3.3.0.tar.gz) = 70a1a806d97f6f3b43cdb5d6caac6104f0f63720d5920f6a623078e05e6977d065d2fabca4da1644deb97f09176b88347f0278e4bc699c783d807d3f530421d0
-SHA512 (Core-3.3.0.tar.gz) = 32efb87872485c4a188483ae1172cac2eca2281e7b9ab29f184c047b94f3986d65da199a74c169d0e2fd6af59cf37b7deb69dcfb1cb4763bb1ebca30d46b5b90
+SHA512 (Blender-Exporter-943be3f.tar.gz) = c5b3f62f57d301cb3c8fe06df9e7bf0b704f2c62afa8b8f24cc629382f4356a3616a798e43868da0a9c4c9556c5dcc5c71325024965d6b6bb02f389667352830
+SHA512 (Core-67f6586.tar.gz) = 4c24b97aae145173e888a4f9335dbf2f31e170de5b932ce6e45c8595beed68c344bf47e4ee022a86df850431af90ed1ebb8ca3bb1bf0ed943d383a27dc89d09f