Skip to content

Commit

Permalink
fix: remove the comment above Source1
Browse files Browse the repository at this point in the history
Remove `Source1` and the comment above in fedora
as we don't need vendoring in this case.

Signed-off-by: Miguel Martín <mmartinv@redhat.com>
  • Loading branch information
mmartinv committed Mar 4, 2024
1 parent 28d7618 commit 9f10c55
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .packit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ srpm_build_deps:
actions:
create-archive:
- bash -c "sed -i -r \"s/Source0:.+/Source0:\ fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar/\" fido-device-onboard.spec"
- bash -c "sed -i \"/Source1/d\" fido-device-onboard.spec"
- bash -c "sed -i \"/Source1/d ; /^# See make-vendored-tarfile.sh in upstream repo/d ;\" fido-device-onboard.spec"
- bash -c "git archive --prefix=fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
- bash -c "tar -xvf fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
- bash -c "ls -1 ./fido-device-onboard-rs-${PACKIT_PROJECT_VERSION}.tar"
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ $(RPM_SPECFILE):
-e "s/%{name}-rs-%{version}-vendor-patched.tar.xz/%{name}-rs-$(COMMIT)-vendor-patched.tar.xz/;" \
-e "s/%autosetup -N -a1 -n %{name}-rs-%{version}/%autosetup -N -a1 -n %{name}-rs-$(COMMIT)/;" \
-e "s/%autosetup -p1 -n %{name}-rs-%{version}/%autosetup -p1 -n %{name}-rs-$(COMMIT)/;" fido-device-onboard.spec > $(RPM_SPECFILE)
[ "$(ID)" != "fedora" ] || sed -i '/^Source1/d ; /^# See make-vendored-tarfile.sh in upstream repo/d ;' $(RPM_SPECFILE)

$(RPM_TARBALL):
mkdir -p $(CURDIR)/rpmbuild/SOURCES
Expand Down

0 comments on commit 9f10c55

Please sign in to comment.