Revert OL modifications

SPECS/bootc.spec

@@ -13,7 +13,7 @@
 
 Name:           bootc
 Version:        1.8.0
-Release:        4.0.1%{?dist}
+Release:        4%{?dist}
 Summary:        Bootable container system
 
 # Apache-2.0
@@ -28,7 +28,6 @@ License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
 URL:            https://github.com/containers/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
-Source2:        bootc-oraclelinux-configs.tar.gz
 
 # Don't remove, downstream patch only
 # Patch for integration test RHEL 9.x and 10.x support
@@ -78,21 +77,10 @@ Recommends: podman
 %description -n system-reinstall-bootc
 This package provides a utility to simplify reinstalling the current system to a given bootc image.
 
-%package oraclelinux-configs
-Summary: Configuration files and tools to build Oracle Linux baseline bootc containers
-Recommends: podman
-# The reinstall subpackage intentionally does not require bootc, as it pulls in many unnecessary dependencies
-
-%description oraclelinux-configs
-This package provides config files and utilities to simplify building baseline Oracle Linux bootc images from scratch
-
 %global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman
 
 %prep
 %autosetup -p1 -a1
-# unpack bootc config files
-%setup -q -T -D -a2
-
 # Default -v vendor config doesn't support non-crates.io deps (i.e. git)
 cp .cargo/vendor-config.toml .
 %cargo_prep -N
@@ -127,9 +115,6 @@ export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_insta
 sed -i -e '/https:\/\//d' cargo-vendor.txt
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
-#create directory for container config files and install configs
-mkdir -p %{buildroot}%{_datarootdir}/
-%{__cp} -ar bootc-oraclelinux-configs %{buildroot}%{_datarootdir}/
 
 %install
 %make_install INSTALL="install -p -c"
@@ -143,10 +128,6 @@ exec dnf -y install podman
 EOF
 chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
 
-#create directory for container config files and install configs
-mkdir -p %{buildroot}%{_datarootdir}/
-%{__cp} -ar bootc-oraclelinux-configs %{buildroot}%{_datarootdir}/
-
 %if %{with check}
 %check
 %cargo_test
@@ -172,21 +153,7 @@ mkdir -p %{buildroot}%{_datarootdir}/
 %{_bindir}/system-reinstall-bootc
 %{system_reinstall_bootc_install_podman_path}
 
-%files oraclelinux-configs
-%{_datarootdir}/bootc-oraclelinux-configs
-%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/ol9/build_container_image.sh
-%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/ol10/build_container_image.sh
-%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/ol-image-builder.sh
-%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/qemu-boot-bootc-iso.sh
-%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/qemu-boot-bootc-qcow2.sh
-
-
 %changelog
-* Tue Mar 24 2026 Darren Archibald <darren.archibald@oracle.com> - 1.8.0-4.0.1
-- Update bootc-oraclelinux-configs and image-builder scripts
-- Also add image-builder helper scripts and configs
-- Add bootc-oraclelinux-configs
-
 * Fri Jan 23 2026 Joseph Marrero <jmarrero@fedoraproject.org> - 1.8.0-4
 - Backport https://github.com/bootc-dev/bootc/pull/1752
   Resolves: #RHEL-143203
@@ -296,3 +263,4 @@ mkdir -p %{buildroot}%{_datarootdir}/
 
 * Mon Dec 11 2023 Colin Walters <walters@verbum.org> - 0.1.4-2
 - Initial import from fedora
+