From 71d0c5bcba89e6f146e4ff7a3a90be881e1bf1f4 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 15 Jan 2020 20:52:42 -0800 Subject: [PATCH] Fix monitor-helm* specfiles for new tarballs Newer tarballs generated from github contain a different top-level directory than what are currently contained in the CENGN mirror cache. By parsing the first entry in the tarball we can figure out the proper directory. Tested by building both the new and old tarballs and verifing the RPM builds correctly and the log file has correct directory. Change-Id: Ie484cb2f5c615917afd320749ab3e68c8f7a8daa Closes-Bug: 1857049 Signed-off-by: Saul Wold (cherry picked from commit 3d8669b6e952b939fa22f2598dbc6f27584b1940) --- monitor-helm-elastic/centos/monitor-helm-elastic.spec | 2 +- monitor-helm/centos/monitor-helm.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitor-helm-elastic/centos/monitor-helm-elastic.spec b/monitor-helm-elastic/centos/monitor-helm-elastic.spec index f4f78a3..3fc5ab2 100644 --- a/monitor-helm-elastic/centos/monitor-helm-elastic.spec +++ b/monitor-helm-elastic/centos/monitor-helm-elastic.spec @@ -37,7 +37,7 @@ BuildRequires: chartmuseum Monitor Helm elasticsearch charts %prep -%setup -n helm-charts-elastic +%setup -n %(tar tf %SOURCE0 | head -1) %patch01 -p1 %patch02 -p1 %patch03 -p1 diff --git a/monitor-helm/centos/monitor-helm.spec b/monitor-helm/centos/monitor-helm.spec index d7268a7..269a941 100644 --- a/monitor-helm/centos/monitor-helm.spec +++ b/monitor-helm/centos/monitor-helm.spec @@ -44,7 +44,7 @@ BuildRequires: chartmuseum Monitor Helm charts %prep -%setup -n helm-charts +%setup -n %(tar tf %SOURCE0 | head -1) %patch01 -p1 %patch02 -p1 %patch03 -p1