Skip to content

Commit

Permalink
Keep .spec in git
Browse files Browse the repository at this point in the history
Give up on .spec.in and directly keep the .spec in git. This aligns a
lot better with what packit wants to do, and avoids having explicit
`specfile_path:` and `post-upstream-clone:` actions.
  • Loading branch information
martinpitt committed Jun 14, 2022
1 parent 46b2487 commit 9d7d9c4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ po/LINGUAS:
# Build/Install/dist
#

%.spec: packaging/%.spec.in
sed -e 's/%{VERSION}/$(VERSION)/g' $< > $@
%.spec: packaging/%.spec
sed -e '/^Version:/ s/0/$(VERSION)/g' $< > $@

packaging/arch/PKGBUILD: packaging/arch/PKGBUILD.in
sed 's/VERSION/$(VERSION)/; s/SOURCE/$(TARFILE)/' $< > $@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

Name: cockpit-podman
Version: %{VERSION}
Version: 0
Release: 1%{?dist}
Summary: Cockpit component for Podman containers
License: LGPLv2+
Expand Down
3 changes: 0 additions & 3 deletions packit.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
upstream_project_url: https://github.com/cockpit-project/cockpit-podman
# enable notification of failed downstream jobs as issues
issue_repository: https://github.com/cockpit-project/cockpit-podman
specfile_path: cockpit-podman.spec
upstream_package_name: cockpit-podman
downstream_package_name: cockpit-podman
# use the nicely formatted release description from our upstream release, instead of git shortlog
copy_upstream_release_description: true

actions:
post-upstream-clone: make cockpit-podman.spec
create-archive: make dist

srpm_build_deps:
Expand Down Expand Up @@ -38,7 +36,6 @@ jobs:
- centos-stream-8-x86_64
- centos-stream-9-x86_64
actions:
post-upstream-clone: make cockpit-podman.spec
# HACK: tarball for releases (copr_build, koji, etc.), copying spec's Source0; this
# really should be the default, see https://github.com/packit/packit-service/issues/1505
create-archive:
Expand Down

0 comments on commit 9d7d9c4

Please sign in to comment.