diff --git a/packages/foreman/foreman/foreman.spec b/packages/foreman/foreman/foreman.spec index ffd4256232b..8cb4b6f18a5 100644 --- a/packages/foreman/foreman/foreman.spec +++ b/packages/foreman/foreman/foreman.spec @@ -678,6 +678,7 @@ cat > %{buildroot}%{_sysconfdir}/rpm/macros.%{name}-plugin << EOF # -n Overrides default of gem_name %%%{name}_bundlerd_file(n:) \\ mkdir -p %%{buildroot}%%{%{name}_bundlerd_dir} \\ +echo %%{%{name}_bundlerd_dir}/%%{-n*}%%{!?-n:%%{gem_name}} >> %%%{name}_plugin_files \\ cat < %%{buildroot}%%{%{name}_bundlerd_dir}/%%{-n*}%%{!?-n:%%{gem_name}}.rb \\ gem '%%{-n*}%%{!?-n:%%{gem_name}}' \\ GEMFILE @@ -707,6 +708,7 @@ chown foreman:foreman %%{foreman_dir}/tmp/restart_required_changed_plugins || : # -a Prebuild apipie cache # -s Precompile assets %%%{name}_precompile_plugin(r:n:as) \\ +touch %%%{name}_plugin_files \\ mkdir -p ./%{_datadir} \\ cp -r %%{%{name}_dir} ./%{_datadir} || echo 0 \\ mkdir -p ./%{_localstatedir}/lib/%{name} \\ @@ -735,16 +737,23 @@ popd \\ rm -rf ./usr \\ %%{?-a:mkdir -p %%{buildroot}%%{foreman_dir}/public/apipie-cache/plugin} \\ %%{?-a:ln -s %%{%{name}_apipie_cache_plugin} %%{buildroot}%%{%{name}_apipie_cache_foreman}} \\ +%%{?-a:echo %%%%dir %%{buildroot}%%{%{name}_apipie_cache_plugin} >> %%%{name}_plugin_files} \\ +%%{?-a:echo %%{buildroot}%%{%{name}_apipie_cache_foreman} >> %%%{name}_plugin_files} \\ %%{?-s:[ -e %%{buildroot}%%{%{name}_assets_plugin} ] && mkdir -p %%{buildroot}%%{foreman_dir}/public/assets} \\ %%{?-s:[ -e %%{buildroot}%%{%{name}_assets_plugin} ] && ln -s %%{%{name}_assets_plugin} %%{buildroot}%%{%{name}_assets_foreman}} \\ +%%{?-s:[ -e %%{buildroot}%%{%{name}_assets_plugin} ] && echo %%%%dir %%{buildroot}%%{%{name}_assets_plugin} >> %%%{name}_plugin_files} \\ +%%{?-s:[ -e %%{buildroot}%%{%{name}_assets_plugin} ] && echo %%{buildroot}%%{%{name}_assets_foreman} >> %%%{name}_plugin_files} \\ %%{?-s:[ -e %%{buildroot}%%{%{name}_webpack_plugin} ] && mkdir -p %%{buildroot}%%{foreman_dir}/public/webpack} \\ %%{?-s:[ -e %%{buildroot}%%{%{name}_webpack_plugin} ] && ln -s %%{%{name}_webpack_plugin} %%{buildroot}%%{%{name}_webpack_foreman}} \\ +%%{?-s:[ -e %%{buildroot}%%{%{name}_webpack_plugin} ] && echo %%%%dir %%{buildroot}%%{%{name}_webpack_plugin} >> %%%{name}_plugin_files} \\ +%%{?-s:[ -e %%{buildroot}%%{%{name}_webpack_plugin} ] && echo %%{buildroot}%%{%{name}_webpack_foreman} >> %%%{name}_plugin_files} \\ %%{?-s:rm -f %%{buildroot}%%{%{name}_webpack_plugin}/*.js.map} \\ %%{?-s:rm -f %%{buildroot}%%{gem_instdir}/public/webpack/foreman-vendor.*} \\ %%{?-s:rm -rf %%{buildroot}%%{gem_instdir}/public/webpack/fonts} \\ %%{?-s:rm -rf %%{buildroot}%%{gem_instdir}/public/webpack/images} EOF +# TODO: exclude package.json & webpack above? %clean rm -rf %{buildroot}