Revert OL modifications

1000-Remove-sgdisk-requirement.patch

@@ -1,33 +0,0 @@
-From 3848984ed8bcbc1829effa6f3fefbc5736bbde39 Mon Sep 17 00:00:00 2001
-From: Angel Perez <angel.perez@oracle.com>
-Date: Wed, 5 Mar 2025 20:59:17 +0000
-Subject: [PATCH] Remove sgdisk requirement
-
-ignition-edge now, is the one that deploys sgdisk
-- remove the circular requirement
-
-Orabug: 37470782
-
-Signed-off-by: Angel Perez <angel.perez@oracle.com>
-Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
----
- .../dracut/35ignition-edge/module-setup.sh                     | 3 +--
- 1 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/ignition-edge-b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57/dracut/35ignition-edge/module-setup.sh b/ignition-edge-b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57/dracut/35ignition-edge/module-setup.sh
-index 4330d9e..4052dcf 100644
---- a/ignition-edge-b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57/dracut/35ignition-edge/module-setup.sh
-+++ b/ignition-edge-b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57/dracut/35ignition-edge/module-setup.sh
-@@ -23,8 +23,7 @@ install() {
-         lsblk \
-         sed \
-         grep \
--        realpath \
--        sgdisk
-+        realpath
- 
-     inst_simple "$moddir/ignition-edge-generator" \
-         "$systemdutildir/system-generators/ignition-edge-generator"
--- 
-2.47.1
-

ignition.spec

@@ -35,7 +35,7 @@ Version:                2.22.0
 %global dracutlibdir %{_prefix}/lib/dracut
 
 Name:           ignition
-Release:        3.0.1%{?dist}
+Release:        %autorelease
 Summary:        First boot installer and configuration tool
 
 # Upstream license specification: Apache-2.0
@@ -46,7 +46,6 @@ Source0:        %{gosource}
 Source1:        https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz
 # For vendored gdisk
 Source2:        http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{gdiskversion}.tar.gz
-Patch1000:     1000-Remove-sgdisk-requirement.patch
 
 
 Patch01: 0001-Fix-device-mapper-partitioning.patch
@@ -286,7 +285,13 @@ This package contains dracut modules, services and binaries needed to enable
 Ignition on IoT/Edge systems.
 
 %prep
-%setup
+%if 0%{?fedora}
+%goprep -k
+%autopatch -p1
+%else
+%forgeautosetup -p1
+%endif
+
 tar xvf %{SOURCE1}
 
 %if 0%{?rhel} && 0%{?rhel} == 10
@@ -294,8 +299,6 @@ tar xvf %{SOURCE1}
 tar xvf %{SOURCE2}
 %endif
 
-%autopatch -v -p1
-
 %build
 export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true "
 %if 0%{?rhel} && 0%{?rhel} <= 8
@@ -378,9 +381,6 @@ install -D -p -m 0755 sgdisk %{buildroot}%{_libexecdir}/ignition-sgdisk
 install -D -p -m 644 COPYING %{buildroot}%{_datadir}/licenses/gdisk/COPYING
 %endif
 
-%post
-ln -s -f %{_libexecdir}/ignition-sgdisk %{_sbindir}/sgdisk
-
 %if %{with check}
 %check
 # Exclude the blackbox tests
@@ -435,9 +435,6 @@ ln -s -f %{_libexecdir}/ignition-sgdisk %{_sbindir}/sgdisk
 %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg
 
 %changelog
-* Thu Dec 18 2025 Darren Archibald <darren.archibald@oracle.com> - 2.22.0-3.0.1
-- Remove sgdisk requirement and create symbolic link to sgdisk [Orabug: 37470782]
-
 ## START: Generated by rpmautospec
 * Tue Nov 18 2025 Steven Presti <spresti@redhat.com> - 2.22.0-3
 - spec: backport fips fix and update build with