From 4e145c290c17ca812416b2b8535b360b94f87abc Mon Sep 17 00:00:00 2001 From: tigro Date: Sun, 17 Dec 2023 21:43:51 +0300 Subject: [PATCH] Fix patches and condition comments --- SPECS/osbuild-composer.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SPECS/osbuild-composer.spec b/SPECS/osbuild-composer.spec index 5db6eec..9021700 100644 --- a/SPECS/osbuild-composer.spec +++ b/SPECS/osbuild-composer.spec @@ -33,10 +33,6 @@ License: Apache-2.0 URL: %{gourl} Source0: %{gosource} -# Patch generated from the upstream rhel-9.3.0 branch: -# git clone https://github.com/osbuild/osbuild-composer.git --branch rhel-9.3.0 -# git format-patch v88.1.. -Patch1: 0001-test-remove-package-version-check.patch # MSVSphere patches Patch1001: 0001-Added-MSVSphere-support.patch @@ -142,7 +138,7 @@ install -m 0644 -vp repositories/msvsphere-* %{buildroot}% # MSVSphere 8 only supports building for MSVSphere 8 install -m 0644 -vp repositories/msvsphere-%{msvsphere}* %{buildroot}%{_datadir}/osbuild-composer/repositories/ %endif -%else # end of MSVSphere support +%else # CentOS also defines rhel so we check for centos first %if 0%{?centos} @@ -168,7 +164,7 @@ install -m 0644 -vp repositories/rhel-%{rhel}* %{buildroot}% %endif %endif %endif -%endif # end of MSVSphere support block +%endif # Fedora can build for all included fedora releases %if 0%{?fedora}