Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refs #18539 - Expand foreman_{assets,webpack}_plugin macros #11233

Open
wants to merge 1 commit into
base: rpm/develop
Choose a base branch
from
Open

Refs #18539 - Expand foreman_{assets,webpack}_plugin macros #11233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions packages/foreman/foreman/foreman.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -863,6 +868,9 @@ exit 0
%systemd_postun %{name}.socket

%changelog
* Wed Sep 11 2024 Ewoud Kohl van Wijngaarden <[email protected]> - 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 <[email protected]> - 3.13.0-0.1.develop
- Bump version to 3.13-develop

Expand Down