From 9649050a6d1b7d53ebe9d81eedfcef931d261507 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Wed, 11 Sep 2024 19:49:51 +0200 Subject: [PATCH] Refs #18539 - Expand foreman_{assets,webpack}_plugin macros These macros now include the directories above it so plugins properly own them. That means on removal (and upgrade is a special case of removal) they're cleaned up. This means the macro now only works in the %files section, but in practice that's the only place it's used. --- packages/foreman/foreman/foreman.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/foreman/foreman/foreman.spec b/packages/foreman/foreman/foreman.spec index ffd4256232..ac99fd3002 100644 --- a/packages/foreman/foreman/foreman.spec +++ b/packages/foreman/foreman/foreman.spec @@ -4,7 +4,7 @@ %global dynflow_sidekiq_service_name dynflow-sidekiq@ %global rake /usr/bin/rake -%global release 1 +%global release 2 %global prereleasesource develop %global prerelease %{?prereleasesource} @@ -686,10 +686,15 @@ GEMFILE %%%{name}_bundlerd_plugin %%{%{name}_bundlerd_dir}/%%{gem_name}.rb %%%{name}_pluginconf_dir %{_sysconfdir}/%{name}/plugins # Common assets locations -%%%{name}_assets_plugin %%{gem_instdir}/public/assets/%%{gem_name} +%%%{name}_assets_plugin \\ +%%dir %%{gem_instdir}/public \\ +%%dir %%{gem_instdir}/public/assets \\ +%%{gem_instdir}/public/assets/%%{gem_name} %%%{name}_assets_foreman %%{foreman_dir}/public/assets/%%{gem_name} # Common webpack locations -%%%{name}_webpack_plugin %%{gem_instdir}/public/webpack/%%{gem_name} +%%%{name}_webpack_plugin \\ +%%dir %%{gem_instdir}/public/webpack \\ +%%{gem_instdir}/public/webpack/%%{gem_name} %%%{name}_webpack_foreman %%{foreman_dir}/public/webpack/%%{gem_name} # Common apipie locations %%%{name}_apipie_cache_plugin %%{gem_instdir}/public/apipie-cache/plugin/%%{gem_name} @@ -863,6 +868,9 @@ exit 0 %systemd_postun %{name}.socket %changelog +* Wed Sep 11 2024 Ewoud Kohl van Wijngaarden - 3.13.0-0.2.develop +- Include parent directories in macros so asset/webpack directories are cleaned up on removal/upgrade + * Tue Aug 20 2024 Patrick Creech - 3.13.0-0.1.develop - Bump version to 3.13-develop