fix merge

2018-05-01 10:18:11 +01:00 · 2018-05-01 10:18:11 +01:00 · 4ad788d784
commit 4ad788d784
parent 1b1acd32b2 6e7ae21362
3 changed files with 7 additions and 5 deletions
--- a/2
+++ b/2
@ -1,4 +1,4 @@
-VERSION ?= 18.0.0
+VERSION ?= 18.0.2
 SANITIZE ?= 1

 DIRNAME = mesa-${VERSION}
--- a/mesa.spec
+++ b/mesa.spec
@ -56,8 +56,8 @@

 Name:           mesa
 Summary:        Mesa graphics libraries
-Version:        18.0.1
-Release:        2%{?rctag:.%{rctag}}%{?dist}
+Version:        18.0.2
+Release:        1%{?rctag:.%{rctag}}%{?dist}

 License:        MIT
 URL:            http://www.mesa3d.org
@ -681,6 +681,9 @@ popd
 %endif

 %changelog
+* Tue May  1 2018 Peter Robinson <pbrobinson@fedoraproject.org> 18.0.2-1
+- Mesa 18.0.2
+
 * Tue Apr 24 2018 Jonas Ådahl <jadahl@redhat.com> - 18.0.1-2
 - Disable rgb10 configs by default (rhbz 1560481)

--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (mesa-18.0.0.tar.xz) = 686c881ddad93e6f1ea48e07d7bc578999e0fc3371f22478e9de3ef1f3accdc866842bca90c2a53d8f5fa47c39aaabde1f3ee23b18322afc7250e322d2deabec
-SHA512 (mesa-18.0.1.tar.xz) = 1db32b2d01a818778f0d299a06db9e088eb4d8a5bfa8945baa448751dfbe87468ce971743d6133d8e4033b07d9dbb166cfa5c01bc4294e1ec1a37de0f98d313d
+SHA512 (mesa-18.0.2.tar.xz) = de7debe457d8b5fd1d5c88ca052fa3e3c77882840fb0a506be87739ef0a73191f9fc89717b94ffdcfc05306c8c9e82c22bdbefbdc4d26d81733169a0315535c8