Skip to content

Commit

Permalink
packaging: drop .in extension on rpm-ostree.spec.in
Browse files Browse the repository at this point in the history
There's no processing done on this spec file nor is it hooked to the
buildsystem. Drop the `.in` extension.

Motivated by the fact that `dnf builddep rpm-ostree.spec.in` in dnf5
gets confused by the non `.spec` extension. And it doesn't have a
`--spec` switch yet to disambiguate.

Related: rpm-software-management/dnf5#810
  • Loading branch information
jlebon committed May 16, 2024
1 parent 5be2ecf commit 0ba1eba
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ci/installdeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ -z "${SKIP_INSTALLDEPS:-}" ] && test $(id -u) -eq 0; then
dnf -y install dnf-plugins-core
# we have the canonical spec file handy so just builddep from that
# XXX: use --allowerasing as a temporary hack to ease the migration to libmodulemd2
time dnf builddep --spec -y packaging/rpm-ostree.spec.in --allowerasing
time dnf builddep --spec -y packaging/rpm-ostree.spec --allowerasing

osid="$(. /etc/os-release && echo $ID)"
if [ "${osid}" == centos ]; then
Expand Down
4 changes: 2 additions & 2 deletions docs/RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ nav_order: 3
# Releasing rpm-ostree

1. Increment the `year_version` and `release_version` macros in `configure.ac`.
2. Increment the `Version` field in `rpm-ostree.spec.in`.
3. Verify the libdnf deps in `rpm-ostree.spec.in` are up to date by copy/pasting
2. Increment the `Version` field in `rpm-ostree.spec`.
3. Verify the libdnf deps in `rpm-ostree.spec` are up to date by copy/pasting
the relevant bits from the spec in the git submodule (`libdnf/libdnf.spec`).
4. Submit as a PR and wait until reviewed *and* CI is green.
5. Once merged, do `git pull $upstream && git reset --hard $upstream/main` on
Expand Down
3 changes: 2 additions & 1 deletion packaging/Makefile.dist-packaging
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ dist-snapshot:
xz -T0 $(PKG_VER).tar

srpm: dist-snapshot
sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec.in > $(PACKAGE).spec; \
sed -e "s,^Version:.*,Version: $(GITREV_FOR_PKG)," $(PACKAGE).spec > $(PACKAGE).spec.new; \
mv $(PACKAGE).spec.new $(PACKAGE).spec; \
./rpmbuild-cwd -bs $(PACKAGE).spec

rpm: srpm
Expand Down
File renamed without changes.

0 comments on commit 0ba1eba

Please sign in to comment.