.gitignore

@@ -1,2 +1 @@
 /azure-loganalytics-0.1.0.zip
-/azure-loganalytics-0.1.0.tgz

generate-source.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-export VERSION=0.1.0
-export PACKAGE_NAME=azure-loganalytics
-WORKING_DIR=$(pwd)
-
-# Download the release and unpack it.
-curl -LO https://github.com/Azure/azure-sdk-for-python/archive/refs/tags/${PACKAGE_NAME}_${VERSION}.tar.gz
-tar xzf ${PACKAGE_NAME}_${VERSION}.tar.gz
-
-# Find the package directory in the SDK release and the parent directory.
-PACKAGE_DIR=$(find azure-sdk-for-python-${PACKAGE_NAME}_${VERSION} -type d -name $PACKAGE_NAME)
-PARENT_DIR=$(dirname $PACKAGE_DIR)
-
-# Build a tarball with a prefix directory that contains the package name and
-# version. Store that in the directory where the script is running.
-pushd $PARENT_DIR
-    tar --transform "s/^${PACKAGE_NAME}/${PACKAGE_NAME}-${VERSION}/" -cz \
-        -f ${WORKING_DIR}/${PACKAGE_NAME}-${VERSION}.tgz $PACKAGE_NAME
-popd

python-azure-loganalytics.spec

@@ -1,36 +1,20 @@
-# EPEL9 does not have python-aiohttp packaged yet.
-%if 0%{?fedora}
-%bcond_without  tests
-%else
-%bcond_with     tests
-%endif
-
 %global         srcname     azure-loganalytics
 
 Name:           python-%{srcname}
 Version:        0.1.0
-Release:        %autorelease
+Release:        5%{?dist}
 Summary:        Microsoft Azure Log Analytics Client Library for Python
 License:        MIT
 URL:            https://pypi.org/project/%{srcname}/
-# This source comes from making a git archive of the main azure-sdk-for-python
+Source0:        %{pypi_source %{srcname} %{version} zip}
-# repository. To reproduce the source code, run the generate-source.sh script.
+Patch0:         remove-custom-wheel-builder.patch
-Source0:        %{srcname}-%{version}.tgz
 
 BuildArch:      noarch
 
-BuildRequires:  python3-devel
 
-%if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python3dist(azure-devtools)
+BuildRequires:  pyproject-rpm-macros
-BuildRequires:  python3dist(azure-mgmt-keyvault)
+
-BuildRequires:  python3dist(azure-mgmt-resource)
-BuildRequires:  python3dist(azure-sdk-tools)
-BuildRequires:  python3dist(msrestazure)
-BuildRequires:  python3dist(pytest)
-BuildRequires:  python3dist(pytest-aiohttp)
-BuildRequires:  python3dist(python-dotenv)
-%endif
 
 %global _description %{expand:
 Microsoft Azure Log Analytics Client Library for Python}
@@ -40,21 +24,20 @@ Microsoft Azure Log Analytics Client Library for Python}
 
 %package -n python3-%{srcname}
 Summary:        %{summary}
-
+Obsoletes:      python3-azure-sdk < 5.0.1
 %description -n python3-%{srcname} %{_description}
 
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -p0 -n %{srcname}-%{version}
 
 # Remove the customized wheel builder included by Microsoft that adds
 # azure-nspkg to the requirements.
-sed -i '/azure-namespace-package/d' setup.cfg
 rm -f azure_bdist_wheel.py
 
 
 %generate_buildrequires
-%pyproject_buildrequires
+%pyproject_buildrequires -r
 
 
 %build
@@ -68,16 +51,6 @@ rm -f azure_bdist_wheel.py
 # files. Remove unneccessary __init__.py that conflicts with other packages.
 rm -rf %{buildroot}%{python3_sitelib}/azure/{__init__.py,__pycache__}
 
-%pyproject_save_files azure
-
-
-%check
-%pyproject_check_import
-
-%if %{with tests}
-%pytest
-%endif
-
 
 %files -n python3-%{srcname}
 %doc README.rst
@@ -86,4 +59,17 @@ rm -rf %{buildroot}%{python3_sitelib}/azure/{__init__.py,__pycache__}
 
 
 %changelog
-%autochangelog
+* Wed Sep 08 2021 Major Hayden <major@mhtx.net> - 0.1.0-5
+- Move obsoletes into subpackage
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 14 2021 Major Hayden <major@mhtx.net> - 0.1.0-3
+- Remove unneccessary __init__.py files to avoid file conflicts.
+
+* Wed Jul 07 2021 Major Hayden <major@mhtx.net> - 0.1.0-2
+- Remove custom wheel builder that adds the azure-nspkg requirement.
+
+* Tue Jun 01 2021 Major Hayden <major@mhtx.net> - 0.1.0-1
+- First package.

remove-custom-wheel-builder.patch

@@ -0,0 +1,20 @@
+diff -up ./MANIFEST.in.orig ./MANIFEST.in
+--- ./MANIFEST.in.orig	2021-07-07 07:57:49.089075245 -0500
++++ ./MANIFEST.in	2021-07-07 07:57:52.238053234 -0500
+@@ -1,2 +1 @@
+ include *.rst
+-include azure_bdist_wheel.py
+\ No newline at end of file
+diff -up ./setup.cfg.orig ./setup.cfg
+--- ./setup.cfg.orig	2021-07-07 07:57:42.345122388 -0500
++++ ./setup.cfg	2021-07-07 07:57:55.897027655 -0500
+@@ -1,8 +1,6 @@
+ [bdist_wheel]
+ universal = 1
+-azure-namespace-package = azure-nspkg
+ 
+ [egg_info]
+-tag_build = 
++tag_build =
+ tag_date = 0
+-

sources

@@ -1 +1 @@
-SHA512 (azure-loganalytics-0.1.0.tgz) = a071104f6be2ceaddbbdba4ec1cb42947be32bccc644571436b9988d5eafba292c0262a09e7120513b00a72020bd5d20036b64389206704f66c6a5440a011b6e
+SHA512 (azure-loganalytics-0.1.0.zip) = f3e902f50e81a585e1660314da59bf29184c8a7f2ce3c06449949e7707631310e3bb12555079ea664fc44596dad53b272f16ac08e78d9069b2fb3f400836c6aa