From 8c2c633755b19bcc6f528ed9bbd7322dde88a931 Mon Sep 17 00:00:00 2001
From: Armel Soro <asoro@redhat.com>
Date: Wed, 2 Nov 2022 15:40:41 +0100
Subject: [PATCH] Fix rpminspect specname inspection failure (#6241)

To anticipate the sunsetting of rpmdiff (replaced by rpminspect), this
makes sure that the odo RPM package passes rpminspect's inspections.
The only error reported at this time was about an invalid spec
filename.

```
specname:
---------
1) Spec filename does not exactly match the primary name odo; got
'openshift-odo.spec'

Result: BAD
Waiver Authorization: Not Waivable

Suggested Remedy: The spec file name does not match the expected
NAME.spec
format.  Rename the spec file to conform to this policy.
```

See
https://docs.google.com/document/d/1PolwQHoZzf0oeOUN1IK7T_NDRAay-nurwL0xYj2JuOo/edit#
for more details.
---
 rpms/{openshift-odo.spec => odo.spec} | 0
 scripts/rpm-local-build.sh            | 2 +-
 scripts/rpm-prepare.sh                | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename rpms/{openshift-odo.spec => odo.spec} (100%)

diff --git a/rpms/openshift-odo.spec b/rpms/odo.spec
similarity index 100%
rename from rpms/openshift-odo.spec
rename to rpms/odo.spec
diff --git a/scripts/rpm-local-build.sh b/scripts/rpm-local-build.sh
index f13662ed3..65f15ed0b 100755
--- a/scripts/rpm-local-build.sh
+++ b/scripts/rpm-local-build.sh
@@ -8,4 +8,4 @@ fi
 
 top_dir="`pwd`/dist/rpmbuild"
 echo "Building locally"
-rpmbuild --define "_topdir `echo $top_dir`" -ba dist/rpmbuild/SPECS/openshift-odo.spec
+rpmbuild --define "_topdir `echo $top_dir`" -ba dist/rpmbuild/SPECS/odo.spec
diff --git a/scripts/rpm-prepare.sh b/scripts/rpm-prepare.sh
index 03a193f82..c50fb734a 100755
--- a/scripts/rpm-prepare.sh
+++ b/scripts/rpm-prepare.sh
@@ -48,8 +48,8 @@ mkdir -p "$SPEC_DIR"
 mkdir -p $SOURCES_DIR/$NAME
 mkdir -p "$FINAL_OUT_DIR"
 
-echo "Generating spec file $SPEC_DIR/openshift-odo.spec"
-envsubst <rpms/openshift-odo.spec > $SPEC_DIR/openshift-odo.spec
+echo "Generating spec file $SPEC_DIR/odo.spec"
+envsubst <rpms/odo.spec > $SPEC_DIR/odo.spec
 
 echo "Generating tarball $SOURCES_DIR/$NAME.tar.gz"
 # Copy code for manipulation