From 3d8669b6e952b939fa22f2598dbc6f27584b1940 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 --- 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 0bb5f9b..19b7090 100644 --- a/monitor-helm-elastic/centos/monitor-helm-elastic.spec +++ b/monitor-helm-elastic/centos/monitor-helm-elastic.spec @@ -36,7 +36,7 @@ BuildRequires: helm 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 b639ab4..61ee5b0 100644 --- a/monitor-helm/centos/monitor-helm.spec +++ b/monitor-helm/centos/monitor-helm.spec @@ -42,7 +42,7 @@ BuildRequires: helm Monitor Helm charts %prep -%setup -n helm-charts +%setup -n %(tar tf %SOURCE0 | head -1) %patch01 -p1 %patch02 -p1 %patch03 -p1