Accepting request 1270888 from Cloud:Tools

OBS-URL: https://build.opensuse.org/request/show/1270888
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/azure-cli-telemetry?expand=0&rev=13

LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Microsoft Corporation. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

act_relax-portalocker.patch

@@ -0,0 +1,12 @@
+diff -Nru azure-cli-telemetry-1.1.0.orig/setup.py azure-cli-telemetry-1.1.0/setup.py
+--- azure-cli-telemetry-1.1.0.orig/setup.py	2023-07-27 09:10:05.000000000 +0200
++++ azure-cli-telemetry-1.1.0/setup.py	2024-11-25 08:39:21.976623236 +0100
+@@ -40,7 +40,7 @@
+     classifiers=CLASSIFIERS,
+     install_requires=[
+         'applicationinsights>=0.11.1,<0.12',
+-        'portalocker>=1.6,<3',
++        'portalocker>=1.6,<4',
+     ],
+     packages=[
+         'azure.cli.telemetry',

azure-cli-telemetry.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Apr 18 18:29:00 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Explicitly label act_relax-portalocker.patch as Patch0
+
+-------------------------------------------------------------------
+Mon Nov 25 12:47:21 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Add patch to relax python-portalocker version dependency in setup.py
+  + act_relax-portalocker.patch
+- Add %{_sitelibdir}/azure/cli directory in %files section
+- Drop superflouos azure-cli-core from BuildDepends
+- Drop extra LICENSE.txt as upstream now ships its own
+- Relax python-portalocker version dependency in Requires
+
 -------------------------------------------------------------------
 Wed May 22 10:09:11 UTC 2024 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 

azure-cli-telemetry.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package azure-cli-telemetry
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,18 +31,17 @@ License:        MIT
 Group:          System/Management
 URL:            https://github.com/Azure/azure-cli
 Source:         https://files.pythonhosted.org/packages/source/a/azure-cli-telemetry/azure-cli-telemetry-%{version}.tar.gz
-Source1:        LICENSE.txt
+Patch0:         act_relax-portalocker.patch
 BuildRequires:  %{pythons}-azure-nspkg >= 3.0.0
 BuildRequires:  %{pythons}-pip
 BuildRequires:  %{pythons}-setuptools
 BuildRequires:  %{pythons}-wheel
-BuildRequires:  azure-cli-core
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       %{pythons}-applicationinsights < 0.12
 Requires:       %{pythons}-applicationinsights >= 0.11.1
 Requires:       %{pythons}-azure-nspkg >= 3.0.0
-Requires:       %{pythons}-portalocker < 3.0
+Requires:       %{pythons}-portalocker < 4.0
 Requires:       %{pythons}-portalocker >= 1.6
 Requires:       azure-cli-core
 Conflicts:      azure-cli < 2.0.0
@@ -60,9 +59,9 @@ This package includes:
 
 %prep
 %setup -q -n azure-cli-telemetry-%{version}
+%patch -P0 -p1
 
 %build
-install -m 644 %{SOURCE1} %{_builddir}/azure-cli-telemetry-%{version}
 %pyproject_wheel
 
 %install
@@ -73,6 +72,7 @@ install -m 644 %{SOURCE1} %{_builddir}/azure-cli-telemetry-%{version}
 %defattr(-,root,root,-)
 %doc HISTORY.rst README.rst
 %license LICENSE.txt
+%dir %{_sitelibdir}/azure/cli
 %{_sitelibdir}/azure/cli/telemetry
 %{_sitelibdir}/azure_cli_telemetry-*.dist-info