From da246290cafc49ff278c785fa76f72fac66ae3be Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 10 Nov 2017 18:14:35 +0100
Subject: [PATCH] Sanitize tarball

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 Makefile  | 23 +++++++++++++++++++++++
 mesa.spec | 13 +++++++++----
 sources   |  2 +-
 3 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..b0509d8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+VERSION ?= 17.3.0
+SANITIZE ?= 1
+
+DIRNAME = mesa-${VERSION}
+
+all: archive
+
+clean:
+	rm -rf $(DIRNAME)/
+	rm -f mesa-${VERSION}.tar.xz
+
+clone: clean
+	curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz
+	tar xf mesa-${VERSION}.tar.xz
+
+sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
+ifdef SANITIZE
+	cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+	cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
+endif
+
+archive: clone sanitize
+	tar cf ${DIRNAME}.tar.xz ${DIRNAME}
diff --git a/mesa.spec b/mesa.spec
index d72c223..e4bed98 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -59,17 +59,19 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        17.3.0
-Release:        0.3%{?rctag:.%{rctag}}%{?dist}
+Release:        0.4%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
-Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
+#Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
+Source0:        %{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
 Source1:        vl_decoder.c
 Source2:        vl_mpeg12_decoder.c
+Source3:        Makefile
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
 # Source4 contains email correspondence clarifying the license terms.
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
-Source3:        Mesa-MLAA-License-Clarification-Email.txt
+Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
 Patch1:         0001-llvm-SONAME-without-version.patch
 Patch2:         0002-hardware-gloat.patch
@@ -371,7 +373,7 @@ Headers for development with the Vulkan API.
   cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
 %endif
 
-cp %{SOURCE3} docs/
+cp %{SOURCE4} docs/
 
 # this is a hack for S3TC support. r200_screen.c is symlinked to
 # radeon_screen.c in git, but is its own file in the tarball.
@@ -690,6 +692,9 @@ popd
 %endif
 
 %changelog
+* Fri Nov 10 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 17.3.0-0.4.rc3
+- Sanitize tarball
+
 * Wed Nov  8 2017 Peter Robinson <pbrobinson@fedoraproject.org> 17.3.0-0.3.rc3
 - Update to 17.3.0-rc3
 
diff --git a/sources b/sources
index 7a250b1..3151b51 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-17.3.0-rc3.tar.xz) = 403da79ac87325f2f0962e9be406edf4d009b6f5d479c2943be5bc1a26ad201d96072461a0d041b5a59abe327829eeba0dfb44abce217074079c47811729b058
+SHA512 (mesa-17.3.0-rc3.tar.xz) = 721625601c0a4e1fd3f396e4c0cded5c05bfd6020f19896bdc0902b06c0e2277fe04599c386ae11223e15234379ec660cc317feb4d96711caa1be03f5ba48b68