Skip to content

Commit 8c2c633

Browse files
authored
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.
1 parent 918a4e9 commit 8c2c633

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: rpms/openshift-odo.spec renamed to rpms/odo.spec

File renamed without changes.

Diff for: scripts/rpm-local-build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ fi
88

99
top_dir="`pwd`/dist/rpmbuild"
1010
echo "Building locally"
11-
rpmbuild --define "_topdir `echo $top_dir`" -ba dist/rpmbuild/SPECS/openshift-odo.spec
11+
rpmbuild --define "_topdir `echo $top_dir`" -ba dist/rpmbuild/SPECS/odo.spec

Diff for: scripts/rpm-prepare.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ mkdir -p "$SPEC_DIR"
4848
mkdir -p $SOURCES_DIR/$NAME
4949
mkdir -p "$FINAL_OUT_DIR"
5050

51-
echo "Generating spec file $SPEC_DIR/openshift-odo.spec"
52-
envsubst <rpms/openshift-odo.spec > $SPEC_DIR/openshift-odo.spec
51+
echo "Generating spec file $SPEC_DIR/odo.spec"
52+
envsubst <rpms/odo.spec > $SPEC_DIR/odo.spec
5353

5454
echo "Generating tarball $SOURCES_DIR/$NAME.tar.gz"
5555
# Copy code for manipulation

0 commit comments

Comments
 (0)