From d0f8d4b689902939129b31aa7ca7451f5873b12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Sun, 23 Oct 2022 13:34:38 +0200
Subject: [PATCH] Update to 2022.2

---
 shaderc.spec | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/shaderc.spec b/shaderc.spec
index 345297b..7915ac5 100644
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -1,15 +1,6 @@
 # Force out of source build
 %undefine __cmake_in_source_build
 
-<<<<<<< HEAD
-# Release 2022.2
-%global commit          551f106dc64a1cacb298cc2f05613d142b53302f
-%global shortcommit     %(c=%{commit}; echo ${c:0:7})
-%global snapshotdate    20220811
-
-# Glslang revision from packaged version
-%global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8
-=======
 # Release 2022.3
 %global commit          551f106dc64a1cacb298cc2f05613d142b53302f
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
@@ -17,14 +8,13 @@
 
 # Glslang revision from packaged version
 %global glslang_version 73c9630da979017b2f7e19c6549e2bdb93d9b238
->>>>>>> 8d827ff (Update to 2022.2)
 
 Name:           shaderc
 Version:        2022.2
 Release:        %autorelease
 Summary:        A collection of tools, libraries, and tests for Vulkan shader compilation
 
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://github.com/google/shaderc
 Source0:        %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 # Patch to unbundle 3rd party code