Packaging: accept normalized Marvin archive names (#13793)

* packaging: accept normalized Marvin archive name

* packaging: accept normalized Marvin archives in RPMs

Use [Mm]arvin-*.tar.gz when copying, listing and installing the
Marvin archive in the EL8 and SUSE15 RPM specs. Keep legacy
uppercase archive names supported.

Tighten the Debian manifest to the same version-delimited pattern.

Author: Dogface2k

debian/cloudstack-marvin.install

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/usr/share/cloudstack-marvin/Marvin*.tar.gz
+/usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz

debian/cloudstack-marvin.postinst

@@ -20,4 +20,4 @@
 set -e
 
 python3 -m pip install --upgrade pip
-python3 -m pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+python3 -m pip install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz

debian/rules

@@ -177,7 +177,7 @@ override_dh_auto_install:
 
 	# cloudstack-marvin
 	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-marvin
-	cp tools/marvin/dist/Marvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/
+	cp tools/marvin/dist/[Mm]arvin-*.tar.gz $(DESTDIR)/usr/share/$(PACKAGE)-marvin/
 
 	# cloudstack-integration-tests
 	mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-integration-tests

packaging/el8/cloud.spec

@@ -392,7 +392,7 @@ install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
 
 # Marvin
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
-cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
+cp tools/marvin/dist/[Mm]arvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
 
 # integration-tests
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -601,7 +601,7 @@ fi
 
 %post marvin
 pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
-pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
 
 #No default permission as the permission setup is complex
 %files management
@@ -711,7 +711,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
 
 %files marvin
-%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
+%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
 %{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
 %{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE
 

packaging/suse15/cloud.spec

@@ -390,7 +390,7 @@ install -D usage/target/transformed/cloudstack-usage.logrotate ${RPM_BUILD_ROOT}
 
 # Marvin
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin
-cp tools/marvin/dist/Marvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
+cp tools/marvin/dist/[Mm]arvin-*.tar.gz ${RPM_BUILD_ROOT}%{_datadir}/%{name}-marvin/
 
 # integration-tests
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-integration-tests
@@ -599,7 +599,7 @@ fi
 
 %post marvin
 pip3 install --upgrade https://files.pythonhosted.org/packages/08/1f/42d74bae9dd6dcfec67c9ed0f3fa482b1ae5ac5f117ca82ab589ecb3ca19/mysql_connector_python-8.0.31-py2.py3-none-any.whl
-pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
+pip3 install --upgrade /usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
 
 #No default permission as the permission setup is complex
 %files management
@@ -709,7 +709,7 @@ pip3 install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
 %{_defaultdocdir}/%{name}-usage-%{version}/NOTICE
 
 %files marvin
-%attr(0644,root,root) %{_datadir}/%{name}-marvin/Marvin*.tar.gz
+%attr(0644,root,root) %{_datadir}/%{name}-marvin/[Mm]arvin-*.tar.gz
 %{_defaultdocdir}/%{name}-marvin-%{version}/LICENSE
 %{_defaultdocdir}/%{name}-marvin-%{version}/NOTICE