Merge pull request #75 from simaishi/add_webpack_manifest

Add webpack manifest (cherry picked from commit 93e52a5)
ManageIQ · Jul 17, 2020 · a7ed302 · a7ed302
1 parent 96e1df2
commit a7ed302
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/rpm_spec/manageiq.spec.in b/rpm_spec/manageiq.spec.in
@@ -90,6 +90,9 @@ install -m644 %{gemset_builddir}/enable %{buildroot}%{gemset_root}
 %{__mkdir} -p %{buildroot}%{manifest_root}
 %{__cp} -r %{manifest_builddir}/* %{buildroot}%{manifest_root}
 
+# Move webpack manifest
+%{__mv} %{buildroot}%{app_root}/public/packs/webpack-modules-manifest.json %{buildroot}%{manifest_root}/webpack_manifest.json
+
 # workaround
 %{__rm} -rf %{buildroot}/%{gemset_root}/gems/ffi-*/ext
 
@@ -126,7 +129,6 @@ popd
 #copy all files/directories below COPY
 %{__cp} -r ./%{appliance_builddir}/COPY/* %{buildroot}/
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/rpm_spec/subpackages/manageiq-gemset b/rpm_spec/subpackages/manageiq-gemset
@@ -47,3 +47,4 @@ Requires: network-scripts
 %{gemset_root}/specifications
 %{gemset_root}/vmdb
 %{gemset_root}/enable
+%{manifest_root}/gem_manifest.csv
diff --git a/rpm_spec/subpackages/manageiq-system b/rpm_spec/subpackages/manageiq-system
@@ -23,7 +23,7 @@ Requires: openldap-clients
 /root/.ansible.cfg
 %{appliance_root}
 %{app_root}/log/apache
-%{manifest_root}
+%dir %{manifest_root}
 %{_bindir}/cloud_ds_check.sh
 %{_bindir}/cockpit-auth-miq
 %{_bindir}/evm*

diff --git a/rpm_spec/subpackages/manageiq-ui b/rpm_spec/subpackages/manageiq-ui
@@ -11,4 +11,6 @@ Requires: httpd
 %{app_root}/public/assets
 %{app_root}/public/packs
 %{app_root}/public/ui
+%{manifest_root}/npm_manifest.csv
+%{manifest_root}/webpack_manifest.json
 %config(noreplace) %{app_root}/public/custom.css