From b52df840951a2818753915916a942013feb346f7 Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Thu, 24 Oct 2024 13:02:21 -0400
Subject: [PATCH] Remove special provision for c9s

It was always only temporary.

Signed-off-by: mulhern <amulhern@redhat.com>
---
 mockbuild_test/stratisd.spec | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/mockbuild_test/stratisd.spec b/mockbuild_test/stratisd.spec
index ac3e6b7..2107541 100644
--- a/mockbuild_test/stratisd.spec
+++ b/mockbuild_test/stratisd.spec
@@ -85,10 +85,8 @@ Requires:     stratisd
 %prep
 %autosetup -n stratisd-stratisd-v%{version} %{?rhel:-a1}
 
-%if 0%{?rhel} >= 10
+%if 0%{?rhel}
 %cargo_prep -v vendor
-%elif 0%{?rhel} && 0%{?rhel} < 10
-%cargo_prep -V 1
 %else
 %cargo_prep
 %generate_buildrequires
@@ -96,25 +94,15 @@ Requires:     stratisd
 %endif
 
 %build
-%if 0%{?rhel} && 0%{?rhel} < 10
-%{__cargo} build %{?_smp_mflags} --release --bin=stratisd
-%{__cargo} build %{?_smp_mflags} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
-%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
-%{__cargo} rustc %{?_smp_mflags} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
-%{__cargo} build %{?_smp_mflags} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
-%else
 %{cargo_license -f engine,dbus_enabled,min,systemd_compat,extras,udev_scripts} > LICENSE.dependencies
 %{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd
 %{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min --bin=stratis-utils --no-default-features --features engine,min,systemd_compat
 %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-str-cmp --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
 %{__cargo} rustc %{?__cargo_common_opts} --release --bin=stratis-base32-decode --no-default-features --features udev_scripts -- -Ctarget-feature=+crt-static
 %{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd-tools --no-default-features --features engine,extras,min
-%endif
 a2x -f manpage docs/stratisd.txt
 a2x -f manpage docs/stratis-dumpmetadata.txt
-%if 0%{?rhel} >= 10
 %{cargo_vendor_manifest}
-%endif
 
 %install
 %make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
@@ -139,12 +127,8 @@ a2x -f manpage docs/stratis-dumpmetadata.txt
 
 %files
 %license LICENSE
-%if !(0%{?rhel} && 0%{?rhel} < 10)
 %license LICENSE.dependencies
-%endif
-%if 0%{?rhel} >= 10
 %license cargo-vendor.txt
-%endif
 %doc README.md
 %{_libexecdir}/stratisd
 %dir %{_datadir}/dbus-1