From 68faf79ec0555178df02d2cb7570fbbbe0fce35f58b26095aad949f0550ef1ca Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Sat, 12 Oct 2019 11:07:48 +0000
Subject: [PATCH] Accepting request 736839 from
 home:mrostecki:branches:devel:kubic

- Make sure that patches are included in the source package.
- Filter out several rpmlintrc warnings for the source package.

OBS-URL: https://build.opensuse.org/request/show/736839
OBS-URL: https://build.opensuse.org/package/show/devel:tools/grpc?expand=0&rev=50
---
 grpc-rpmlintrc |  9 +++++++++
 grpc.changes   |  6 ++++++
 grpc.spec      | 16 ++++++----------
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 grpc-rpmlintrc

diff --git a/grpc-rpmlintrc b/grpc-rpmlintrc
new file mode 100644
index 0000000..587bc77
--- /dev/null
+++ b/grpc-rpmlintrc
@@ -0,0 +1,9 @@
+# Ignore the following errors in the source package.
+addFilter("grpc-source.* env-script-interpreter")
+addFilter("grpc-source.* files-duplicate")
+addFilter("grpc-source.* hidden-file-or-dir")
+addFilter("grpc-source.* non-executable-script")
+addFilter("grpc-source.* pem-certificate")
+addFilter("grpc-source.* script-without-shebang")
+addFilter("grpc-source.* suse-filelist-forbidden-fhs23")
+addFilter("grpc-source.* version-control-internal-file")
diff --git a/grpc.changes b/grpc.changes
index 7dc7ea9..c65a310 100644
--- a/grpc.changes
+++ b/grpc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 10 00:23:16 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
+
+- Make sure that patches are included in the source package.
+- Filter out several rpmlintrc warnings for the source package.
+
 -------------------------------------------------------------------
 Wed Oct  2 18:39:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/grpc.spec b/grpc.spec
index 44ac6e2..1388e70 100644
--- a/grpc.spec
+++ b/grpc.spec
@@ -28,7 +28,8 @@ Summary:        HTTP/2-based Remote Procedure Call implementation
 License:        Apache-2.0
 Group:          Development/Tools/Building
 URL:            https://grpc.io/
-Source:         https://github.com/grpc/grpc/archive/v%rver.tar.gz
+Source0:        https://github.com/grpc/grpc/archive/v%rver.tar.gz
+Source1:        %{name}-rpmlintrc
 Patch1:         gettid.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module devel}
@@ -148,16 +149,11 @@ popd
 %python_install
 
 # Install sources
+make clean
+rm -f "b" "a.out"
+find . -type f "(" -name "*.so" -o -name "*.o" -o -name ".git*" ")" -exec rm -rf {} +
 mkdir -p "%buildroot/%src_install_dir"
-tar -xzf %SOURCE0 --strip-components=1 -C "%buildroot/%src_install_dir"
-find "%buildroot/%src_install_dir" -type d -name ".git*" -exec rm -Rf {} +
-# Fix env-script-interpreter rpmlint error
-find "%buildroot/%src_install_dir" -type f \
-	-exec sed -i 's|#!%_bindir/env bash|#!/bin/bash|' "{}" + \
-	-exec sed -i 's|#!%_bindir/env ruby|#!%_bindir/ruby|' "{}" +
-find "%buildroot/%src_install_dir" -type f "(" -name "*.bzl" -o -name "*.py" ")" \
-	-exec sed -i 's|#!%_bindir/env python2.7|#!%_bindir/python2.7|' "{}" + \
-	-exec sed -i 's|#!%_bindir/env python|#!%_bindir/python|' "{}" +
+cp -r * "%buildroot/%src_install_dir"
 
 %fdupes %buildroot/%_prefix