From 4a35aaff3408cc3942db06f9f912c0e2af4d74b0 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Mon, 23 Jul 2018 11:12:41 +0100
Subject: [PATCH] Update to 2018.4 release

---
 sources          |  2 +-
 spirv-tools.spec | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sources b/sources
index f5033e2..68deafa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (spirv-tools-26a698c34788bb69123a1f3789970a16cf4d9641.tar.gz) = 8637b3131e80af1f865cb3c985e9d8b3a423dc86130790d22c2ec702882dd3966a06d7b0cc2f89f99eca2cb748427368857f1f283cb2d87b66ae590eb61c3957
+SHA512 (spirv-tools-2018.4.tar.gz) = 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
diff --git a/spirv-tools.spec b/spirv-tools.spec
index fe8c641..aec578e 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -1,16 +1,16 @@
-%global commit 26a698c34788bb69123a1f3789970a16cf4d9641
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20180407
-%global gitrel .%{commit_date}.git%{shortcommit}
+#global commit 26a698c34788bb69123a1f3789970a16cf4d9641
+#global shortcommit %%(c=%{commit}; echo ${c:0:7})
+#global commit_date 20180407
+#global gitrel .%%{commit_date}.git%%{shortcommit}
 
 Name:           spirv-tools
-Version:        2018.3.0
-Release:        0.3%{?gitrel}%{?dist}
+Version:        2018.4
+Release:        1%{?dist}
 Summary:        API and commands for processing SPIR-V modules
 
 License:        ASL 2.0
 URL:            https://github.com/KhronosGroup/SPIRV-Tools
-Source0:        %url/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
+Source0:        %url/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  cmake3
 BuildRequires:  gcc-c++
@@ -38,7 +38,7 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Development files for %{name}
 
 %prep
-%autosetup -p1 -n SPIRV-Tools-%{commit}
+%autosetup -p1 -n SPIRV-Tools-%{version}
 
 %build
 %__mkdir_p %_target_platform
@@ -46,6 +46,7 @@ pushd %_target_platform
 %cmake3 -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBDIR=%{_lib} \
         -DSPIRV-Headers_SOURCE_DIR=%{_prefix} \
+        -DPYTHON_EXECUTABLE=%{__python3} \
         -GNinja ..
 %ninja_build
 popd
@@ -79,6 +80,9 @@ popd
 %{_libdir}/pkgconfig/SPIRV-Tools.pc
 
 %changelog
+* Mon Jul 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 2018.4-1
+- Update to 2018.4 release
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018.3.0-0.3.20180407.git26a698c
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild