From 66d02eda217508fbc7dc14570adebf0f7939fa52 Mon Sep 17 00:00:00 2001
From: Thomas Crain <thcrain@microsoft.com>
Date: Sat, 29 Jan 2022 08:12:30 -0800
Subject: [PATCH] [main] [extended] Fix python-ethtool source name collision
 (#2037)

---
 .../python-ethtool/python-ethtool.signatures.json   |  4 ++--
 SPECS-EXTENDED/python-ethtool/python-ethtool.spec   | 13 +++++++++----
 cgmanifest.json                                     | 10 ++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/SPECS-EXTENDED/python-ethtool/python-ethtool.signatures.json b/SPECS-EXTENDED/python-ethtool/python-ethtool.signatures.json
index acbd4b56f6..91819ebeca 100644
--- a/SPECS-EXTENDED/python-ethtool/python-ethtool.signatures.json
+++ b/SPECS-EXTENDED/python-ethtool/python-ethtool.signatures.json
@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "ethtool-0.14.tar.gz": "46565daa5c4de3ef6c5908d062a8646278086cd29c62e43e0e04e49e5e34768b"
+  "python-ethtool-0.14.tar.gz": "27799b729aad0b65edfb2dd480dd433117bbee1cba0bdea467b7d2a6600a69e9"
  }
-}
\ No newline at end of file
+}
diff --git a/SPECS-EXTENDED/python-ethtool/python-ethtool.spec b/SPECS-EXTENDED/python-ethtool/python-ethtool.spec
index b79a8cb144..236659b844 100644
--- a/SPECS-EXTENDED/python-ethtool/python-ethtool.spec
+++ b/SPECS-EXTENDED/python-ethtool/python-ethtool.spec
@@ -8,12 +8,12 @@ Distribution:   Mariner
 
 Name:           python-%{pypi_name}
 Version:        0.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python module to interface with %{pypi_name}
 
 License:        GPLv2
-URL:            https://github.com/fedora-python/%{name}
-Source0:        %{pypi_source}
+URL:            https://github.com/fedora-python/python-ethtool
+Source0:        https://github.com/fedora-python/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 
@@ -39,7 +39,7 @@ PCI locations.
 
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
 
@@ -78,6 +78,11 @@ export PYTHONPATH=%{buildroot}%{python3_sitearch}
 %{python3_sitearch}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
 
 %changelog
+* Fri Jan 28 2022 Thomas Crain <thcrain@microsoft.com> - 0.14-8
+- Fix source name collision with ethtool package
+- Use github source tarball instead of pypi
+- License verified
+
 * Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 0.14-7
 - Initial CBL-Mariner import from Fedora 32 (license: MIT).
 
diff --git a/cgmanifest.json b/cgmanifest.json
index 2b76382bfe..38b1a96d8b 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -22729,6 +22729,16 @@
         }
       }
     },
+    {
+      "component": {
+        "type": "other",
+        "other": {
+          "name": "python-ethtool",
+          "version": "0.14",
+          "downloadUrl": "https://github.com/fedora-python/python-ethtool/archive/refs/tags/v0.14.tar.gz"
+        }
+      }
+    },
     {
       "component": {
         "type": "other",