diff --git a/.gitignore b/.gitignore index 0b82cac..090c044 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ cockpit-image-builder-94.3.tar.gz -composer-frontend.tar.gz diff --git a/cockpit-image-builder.spec b/cockpit-image-builder.spec index 0c80243..f0052d8 100644 --- a/cockpit-image-builder.spec +++ b/cockpit-image-builder.spec @@ -1,14 +1,11 @@ -#switch to use old composer frontend -%bcond_without composer Name: cockpit-image-builder Version: 94.3 -Release: 1.0.1%{?dist} +Release: 1%{?dist} Summary: Image builder plugin for Cockpit License: Apache-2.0 URL: http://osbuild.org/ Source0: https://github.com/osbuild/image-builder-frontend/releases/download/v%{version}/%{name}-%{version}.tar.gz -Source1: composer-frontend.tar.gz Obsoletes: cockpit-composer < 54 Provides: cockpit-composer = %{version}-%{release} @@ -32,81 +29,25 @@ as a frontend for osbuild. %prep %setup -q -n %{name} -%if %{with composer} -%setup -q -T -D -a1 -n %{name} -%{__mv} composer-frontend/LICENSE.txt ./ -%{__mv} composer-frontend/README.md ./ -%endif -declare -A replacements - -replacements=( - [#creating-a-blueprint_creating-blueprints-and-blueprint-images]="" - [https://docs.redhat.com/en/documentation/red_hat_insights/1-latest/html/deploying_and_managing_rhel_systems_in_hybrid_clouds/index]="https://docs.oracle.com/en/operating-systems/oracle-linux/10/ibldr/AboutImageBuilder.html" - [https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/configuring_basic_system_settings/assembly_using-secure-communications-between-two-systems-with-openssh_configuring-basic-system-settings#generating-ssh-key-pairs_assembly_using-secure-communications-between-two-systems-with-openssh]="https://docs.oracle.com/en/cloud/cloud-at-customer/occ-get-started/generate-ssh-key-pair.html" - [https://docs.redhat.com/en/documentation/edge_management/2022/html/create_rhel_for_edge_images_and_configure_automated_management/index]="https://docs.oracle.com/en/operating-systems/oracle-linux/10/ibldr/AboutImageBuilder.html" -) - -for rhel_url in access.redhat.com docs.redhat.com; do - grep ${rhel_url} -rl --include='*.js' --include='*.json' --include '*.json.in' --include='*.jsx' --include='*.ts' --include='*.js.map' | while read filename; do - for string in ${!replacements[@]}; do - sed -i.bak "s|$string|${replacements[$string]}|g" $filename - if [ -e "$filename.bak" ]; then - touch -r "$filename.bak" "$filename" - rm -f "$filename.bak" - fi - done - done - - for archive in $( find . -name '*.js.gz' -o -name '*.json.gz' -o -name '*.json.in.gz' -o -name '*.jsx.gz' -o -name '*.ts.gz' -o -name '*.js.map.gz' | xargs zgrep -l ${rhel_url} ); do - for string in ${!replacements[@]}; do - mv -v $archive ${archive}.bak - zcat ${archive}.bak | sed "s|$string|${replacements[$string]}|g" > ${archive%.gz} - gzip ${archive%.gz} - if [ -e "${archive}.bak" ]; then - touch -r "${archive}.bak" "${archive}" - rm -f "${archive}.bak" - fi - done - done -done %build # Nothing to build %install -%if %{with composer} -install -d %{buildroot}/%{_datadir}/cockpit/composer -%{__cp} -ar composer-frontend/* %{buildroot}/%{_datadir}/ -%else %make_install PREFIX=/usr # drop source maps, they are large and just for debugging find %{buildroot}%{_datadir}/cockpit/ -name '*.map' | xargs --no-run-if-empty rm --verbose -%endif -%if %{without composer} %check appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/* -%endif %files -%doc README.md -%if %{with composer} -%license LICENSE.txt -%{_datadir}/cockpit/composer -%{_datadir}/metainfo/* -%else %doc cockpit/README.md %license LICENSE %{_datadir}/cockpit/cockpit-image-builder %{_datadir}/metainfo/* -%endif %changelog -* Wed Jul 15 2026 Darren Archibald - 94.3-1.0.1 -- Switch to old frotend [Orabug: 38011073] [Orabug: 37856296] [Orabug: 37856375] -- Replaced additional upstream url [Orabug: 37856187] -- Replaced upstream urls in documentation with oracle links [Orabug: 37856187] - * Fri Jun 6 2026 Sanne Raymaekers - 94.3-1 - New upstream release diff --git a/sources b/sources index 586056c..13f7230 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (cockpit-image-builder-94.3.tar.gz) = 466734d53dc410632f86344f4be612839e997c54a95561c8816a9585e006e79cadcb963baf8388703ff6c792a8539002994d5099cf2a3768ce6337f7a83b5b1c -SHA512 (composer-frontend.tar.gz) = 4c6447a399ae90cb78f753ffb3649a1b7d2b33fac3ce8e072cac0c7b25aa99ce3d7644f860e36f6a4a4555856964abe20bceaf806a2edf2f0ba6097bd9aadc16