Skip to content

Commit

Permalink
Fix rpminspect specname inspection failure (#6241)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rm3l authored Nov 2, 2022
1 parent 918a4e9 commit 8c2c633
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/rpm-local-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions scripts/rpm-prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8c2c633

Please sign in to comment.