[rpms/ipxe] rawhide: use upstream version numbers, forge macros for git snapshots

[rpms/ipxe] rawhide: use upstream version numbers, forge macros for git snapshots

[Michal Schmidt]

            A new commit has been pushed.

            Repo   : rpms/ipxe
            Branch : rawhide
            Commit : 9920f1aa0f413594b6574368331518e100d1b76a
            Author : Michal Schmidt <mschmidt@redhat.com>
            Date   : 2026-06-15T17:07:08+02:00
            Stats  : +15/-18 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/ipxe/c/9920f1aa0f413594b6574368331518e100d1b76a?branch=rawhide

            Log:
            use upstream version numbers, forge macros for git snapshots

Use the forge macros recommended by the Fedora packaging guidelines.
https://docs.fedoraproject.org/en-US/packaging-guidelines/SourceURL/

This saves us from the manual tarball creation that was described in
a comment.

Contrary to what the comment said, upstream now provides tagged
releases on github. Even the previously packaged snapshot was a
descendant of a release tag (v1.21.1):
  $ git describe --tags --match 'v*' de8a0821
  v1.21.1-529-gde8a0821c7bc

Use the standard naming scheme for post-release snapshots, i.e.,
  ipxe-1.21.1^20240119gitde8a082-1.fc44

The previously used scheme gave us:
  ipxe-20240119-5.gitde8a0821.fc44

Because Version 1.21.1 sorts lower than 20240119, add an Epoch.

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>

---
diff --git a/.gitignore b/.gitignore
index 71bf9ab..478fa9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ noarch/
 .build*.log
 *.src.rpm
 /ipxe-*.tar.xz
+/ipxe-de8a0821c7bc737e724fa3dfb6d89dc36f591d7a.tar.gz

diff --git a/ipxe.spec b/ipxe.spec
index dc375a1..08b1cf9 100644
--- a/ipxe.spec
+++ b/ipxe.spec
@@ -24,28 +24,22 @@
 # package is currently clashing in koji, so don't bother.
 %global debug_package %{nil}
 
-# Upstream don't do "releases" :-( So we're going to use the date
-# as the version, and a GIT hash as the release. Generate new GIT
-# snapshots using the folowing commands:
-#
-# $ hash=`git log -1 --format='%h'`
-# $ date=`git log -1 --format='%cd' --date=short | tr -d -`
-# $ git archive --prefix ipxe-${date}-git${hash}/ ${hash} | xz -7e > ipxe-${date}-git${hash}.tar.xz
-#
-# And then change these two:
-
-%global hash de8a0821
+%global forgeurl https://github.com/ipxe/ipxe/
+%global commit de8a0821c7bc737e724fa3dfb6d89dc36f591d7a
 %global date 20240119
+%global version0 1.21.1
+%forgemeta
 
 Name:    ipxe
-Version: %{date}
-Release: 5.git%{hash}%{?dist}
 Summary: A network boot loader
+Epoch:   1
+Version: %forgeversion
+Release: 1%{?dist}
 
 License: BSD-2-Clause AND BSD-3-Clause AND GPL-2.0-only AND (GPL-2.0-only OR MPL-1.1) AND GPL-2.0-or-later AND GPL-2.0-or-later WITH UBDL-exception AND ISC AND MIT
 URL:     http://ipxe.org/
 
-Source0: %{name}-%{version}-git%{hash}.tar.xz
+Source:  %forgesource
 
 # Enable IPv6 for qemu's config
 # Sent upstream: http://lists.ipxe.org/pipermail/ipxe-devel/2015-November/004494.html
@@ -138,8 +132,7 @@ replacement for proprietary PXE ROMs, with many extra features such as
 DNS, HTTP, iSCSI, etc.
 
 %prep
-%setup -q -n %{name}-%{version}-git%{hash}
-%autopatch -p1
+%forgeautosetup -p1
 # ath9k drivers are too big for an Option ROM, and ipxe devs say it doesn't
 # make sense anyways
 # http://lists.ipxe.org/pipermail/ipxe-devel/2012-March/001290.html
@@ -151,7 +144,7 @@ cd src
 make_ipxe() {
     make %{?_smp_mflags} \
         NO_WERROR=1 V=1 \
-        GITVERSION=%{hash} \
+        GITVERSION=%{commit} \
         "$@"
 }
 
@@ -280,6 +273,9 @@ cp -a src/bin-arm64-efi/ipxe.efi %{buildroot}/%{_datadir}/%{name}/arm64-efi/ipxe
 %endif
 
 %changelog
+* Fri Jun 12 2026 Michal Schmidt <mschmidt@redhat.com> - 1:1.21.1^20240119gitde8a082-1
+- Use forge macros
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 20240119-5.gitde8a0821
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index b98d924..bec91bf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipxe-20240119-gitde8a0821.tar.xz) = 75f6e926e4f8c45ff661df50158c6eede38cac6e8f90c48157784c64761908b0c272c1a4c1e7e49d6efdb4c93611bf6fb018b99dd8d027bc42848aaa0ad223a2
+SHA512 (ipxe-de8a0821c7bc737e724fa3dfb6d89dc36f591d7a.tar.gz) = 562b96795ee0f3ffde9d12412a04f7b6f00999f385f9ae272d08b62d892380c59a80b97988e291c653e700fd3ba161947225cac4fba0b13facc9a631a63af35f