From 9990a4ca5c14f13eb22036c094b767c902bcafe5 Mon Sep 17 00:00:00 2001
From: sumsharma <sumedh.alok@gmail.com>
Date: Tue, 19 Jul 2022 23:17:53 +0530
Subject: [PATCH] (a) Fixing build dependencies. (b) Renaming folders/files to
 remove version specific string. Adding sub-package in spec file. (c) SPEC
 cleanup.

---
 .../python-geomet.signatures.json}            |  0
 .../python-geomet.spec}                       | 33 ++++++++++++-------
 2 files changed, 22 insertions(+), 11 deletions(-)
 rename SPECS/{python3-geomet/python3-geomet.signatures.json => python-geomet/python-geomet.signatures.json} (100%)
 rename SPECS/{python3-geomet/python3-geomet.spec => python-geomet/python-geomet.spec} (71%)

diff --git a/SPECS/python3-geomet/python3-geomet.signatures.json b/SPECS/python-geomet/python-geomet.signatures.json
similarity index 100%
rename from SPECS/python3-geomet/python3-geomet.signatures.json
rename to SPECS/python-geomet/python-geomet.signatures.json
diff --git a/SPECS/python3-geomet/python3-geomet.spec b/SPECS/python-geomet/python-geomet.spec
similarity index 71%
rename from SPECS/python3-geomet/python3-geomet.spec
rename to SPECS/python-geomet/python-geomet.spec
index 4fdd66bf81e..144bd86b059 100755
--- a/SPECS/python3-geomet/python3-geomet.spec
+++ b/SPECS/python-geomet/python-geomet.spec
@@ -1,4 +1,7 @@
-Name:           python3-geomet
+%global srcname geomet
+%global debug_package %{nil}
+
+Name:           python-%{srcname}
 Version:        0.2.1
 Release:        1%{?dist}
 Summary:        GeoJSON <-> WKT/WKB conversion utilities
@@ -7,20 +10,28 @@ Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Development/Languages/Python
 Url:            https://github.com/geomet
-Source0:        https://github.com/geomet/geomet/archive/refs/tags/%{version}.tar.gz#/geomet-%{version}.tar.gz
-BuildRequires:  python3
-BuildRequires:  python3-libs
+Source0:        https://github.com/geomet/geomet/archive/refs/tags/%{version}.tar.gz#/%{srcname}-%{version}.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
+%if %{with_check}
+BuildRequires:  python3-pip
+%endif
+
+%global _description \
+Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa.
+
+%description %_description
+
+%package -n python3-%{srcname}
+Summary:        %{summary}
 Requires:       python3
-Requires:       python3-libs
 Requires:       python3-six
 Requires:       python3-click
 Requires:       python3-setuptools
 
-BuildArch:      noarch
-
-%description
-Convert GeoJSON to WKT/WKB (Well-Known Text/Binary), and vice versa.
+%description -n python3-%{srcname} %{_description}
 
 %prep
 %autosetup -n geomet-%{version}
@@ -36,7 +47,7 @@ rm -f %{buildroot}/%{_exec_prefix}/LICENSE
 %check
 %python3 setup.py test
 
-%files
+%files -n python3-%{srcname}
 %defattr(-,root,root,-)
 %license LICENSE
 %{_bindir}/geomet
@@ -44,7 +55,7 @@ rm -f %{buildroot}/%{_exec_prefix}/LICENSE
 
 %changelog
 *   Wed Jun 22 2022 Sumedh Sharma <sumsharma@microsoft.com> - 0.2.1-1
--   Initial CBL-Mariner import from PhotonOS (license: ASL 2.0)
+-   Initial CBL-Mariner import from Photon (license: Apache2).
 -   Bumping version to 0.2.1
 -   Adding as run dependency for python-cassandra-driver needed by cassandra-medusa.
 -   License Verified.