Update to 1.7-RC1, add spec logic to cater for snapshots as well as RCs

0001-Fixed-LLVM-12-support-clang-CompilerInvocation-setLa.patch

@@ -1,33 +0,0 @@
-From 8b4a9ea55eae467d286959f5e63a58ad533f4d87 Mon Sep 17 00:00:00 2001
-From: KOLANICH <kolan_n@mail.ru>
-Date: Wed, 10 Feb 2021 13:36:35 +0300
-Subject: [PATCH] Fixed LLVM 12 support:
- clang::CompilerInvocation::setLangDefaults signature was changed in
- https://github.com/llvm/llvm-project/commit/c495dfe0268bc2be8737725d657411baa1399e9d
-
----
- lib/CL/pocl_llvm_build.cc | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/lib/CL/pocl_llvm_build.cc b/lib/CL/pocl_llvm_build.cc
-index 5c60743d..1fb838b4 100644
---- a/lib/CL/pocl_llvm_build.cc
-+++ b/lib/CL/pocl_llvm_build.cc
-@@ -419,7 +419,13 @@ int pocl_llvm_build_program(cl_program program,
- #else
-                              clang::InputKind::OpenCL,
- #endif
--                             triple, po, clang::LangStandard::lang_opencl12);
-+                             triple,
-+#ifndef LLVM_OLDER_THAN_12_0
-+                             po.Includes,
-+#else
-+                             po,
-+#endif
-+                             clang::LangStandard::lang_opencl12);
- 
-   // LLVM 3.3 and older do not set that char is signed which is
-   // defined by the OpenCL C specs (but not by C specs).
--- 
-2.26.2
-

pocl.spec

@@ -1,21 +1,25 @@
 %global sover 2
 %global with_tests 1
-%global commit a2d016c84d2034f43062d7f22b4874cfffe5c127
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+#global commit a2d016c84d2034f43062d7f22b4874cfffe5c127
+#global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global candidate RC1
 
 Name:           pocl
 %global ver 1.7
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(string.lower(ver))}
-Release:        0.3.20210218git%{shortcommit}%{?dist}
+Release:        0.4%{?candidate:.%{candidate}}%{?shortcommit:.%{shortcommit}}%{?dist}
 Summary:        Portable Computing Language - an OpenCL implementation
 # The whole code is under MIT
 # except include/utlist.h which is under BSD (and unbundled) and
 # except lib/kernel/vecmath which is under GPLv3+ or LGPLv3+ (and unbundled in future)
 License:        MIT and BSD and (GPLv3+ or LGPLv3+)
 URL:            http://portablecl.org/
-Source0:        https://github.com/pocl/pocl/archive/%{commit}/pocl-%{shortcommit}.tar.gz
 
-Patch0:         0001-Fixed-LLVM-12-support-clang-CompilerInvocation-setLa.patch
+%if 0%{?shortcommit}
+Source0:        https://github.com/pocl/pocl/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
+%else
+Source0:        https://github.com/pocl/pocl/archive/%{name}-%{version}%{?candidate:-%{candidate}}.tar.gz
+%endif
 
 BuildRequires:  cmake
 BuildRequires:  clang clang-devel
@@ -64,7 +68,12 @@ Requires:       uthash-devel
 Portable Computing Language development files.
 
 %prep
+%if 0%{?shortcommit}
 %autosetup -p1 -n pocl-%{commit}
+%else
+%autosetup -p1 -n %{name}-%{version}%{?candidate:-%{candidate}}
+%endif
+
 
 # Unbundle uthash
 find . -depth -name utlist* -print -delete
@@ -126,6 +135,9 @@ find . -depth -name utlist* -print -delete
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sun May 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.7-0.4.RC1
+- Update to 1.7-RC1
+
 * Wed Mar 10 2021 sguelton@redhat.com - 1.7-0.3.20210218gita2d016c
 - rebuilt
 

sources

@@ -1 +1 @@
-SHA512 (pocl-a2d016c.tar.gz) = 2971eb5e690c90b9699e9d5f68b2aa6593287643b3da5689781537921f6ab7c87c590def6d1a07784d2486c00ff39088c5c58f2d132abf31fc969bfbebb23b63
+SHA512 (pocl-1.7-RC1.tar.gz) = dc191dc4d97503ee851b136d5128d778d4ab99ea31a0e52d82b335b8d7d99d90117a8b9ad669008deb903e1ecad20fb1a6b0de6a06f0252c4a6549094b3e5281