From f1f6350e9c78655102cce83ae86621aec8c20b3f Mon Sep 17 00:00:00 2001
From: Dogface2k <100990646+Dogface2k@users.noreply.github.com>
Date: Tue, 4 Aug 2026 13:05:17 +0100
Subject: [PATCH 1/2] packaging: accept normalized Marvin archive name

---
 debian/cloudstack-marvin.install  | 2 +-
 debian/cloudstack-marvin.postinst | 2 +-
 debian/rules                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/cloudstack-marvin.install b/debian/cloudstack-marvin.install
index 5dca252c9ad0..2189d9aa2525 100644
--- a/debian/cloudstack-marvin.install
+++ b/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
diff --git a/debian/cloudstack-marvin.postinst b/debian/cloudstack-marvin.postinst
index a049c1de611f..8adc62544f92 100755
--- a/debian/cloudstack-marvin.postinst
+++ b/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
diff --git a/debian/rules b/debian/rules
index 327447823308..e67a1279626a 100755
--- a/debian/rules
+++ b/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

From 11277984452c5100b2c2eb72cf9413998cb41339 Mon Sep 17 00:00:00 2001
From: Brad <100990646+Dogface2k@users.noreply.github.com>
Date: Tue, 8 Sep 2026 19:16:25 +0100
Subject: [PATCH 2/2] 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.
---
 debian/cloudstack-marvin.install | 2 +-
 packaging/el8/cloud.spec         | 6 +++---
 packaging/suse15/cloud.spec      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/cloudstack-marvin.install b/debian/cloudstack-marvin.install
index 2189d9aa2525..324eb76484c3 100644
--- a/debian/cloudstack-marvin.install
+++ b/debian/cloudstack-marvin.install
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/usr/share/cloudstack-marvin/[Mm]arvin*.tar.gz
+/usr/share/cloudstack-marvin/[Mm]arvin-*.tar.gz
diff --git a/packaging/el8/cloud.spec b/packaging/el8/cloud.spec
index 3ba2e4d5789e..9d8cab846164 100644
--- a/packaging/el8/cloud.spec
+++ b/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
 
diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec
index cdfc5a72a34e..04ab66904287 100644
--- a/packaging/suse15/cloud.spec
+++ b/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