From badb6598737fa9969188c5c23eb87e115aa93d0c1212a2118c6e28b385c0167f Mon Sep 17 00:00:00 2001
From: Johannes Kastl <opensuse_buildservice@ojkastl.de>
Date: Fri, 21 Jun 2024 20:16:33 +0000
Subject: [PATCH] Accepting request 1182519 from
 home:ojkastl_buildservice:Branch_systemsmanagement_ansible

update to 3.1.0 (adjust dependencies, switch to Git checkout, etc...)

OBS-URL: https://build.opensuse.org/request/show/1182519
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:ansible/ansible-builder?expand=0&rev=11
---
 _service                      | 17 ++++++++++++++++-
 ansible-builder-3.0.1.tar.gz  |  3 ---
 ansible-builder-3.1.0.obscpio |  3 +++
 ansible-builder.changes       | 25 +++++++++++++++++++++++++
 ansible-builder.obsinfo       |  4 ++++
 ansible-builder.spec          |  9 +++++----
 6 files changed, 53 insertions(+), 8 deletions(-)
 delete mode 100644 ansible-builder-3.0.1.tar.gz
 create mode 100644 ansible-builder-3.1.0.obscpio
 create mode 100644 ansible-builder.obsinfo

diff --git a/_service b/_service
index 1bd86b8..eebff22 100644
--- a/_service
+++ b/_service
@@ -1,4 +1,19 @@
 <services>
-  <service name="download_files" mode="disabled">
+  <service name="obs_scm" mode="manual">
+    <param name="url">https://github.com/ansible/ansible-builder</param>
+    <param name="scm">git</param>
+    <param name="revision">3.1.0</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="changesgenerate">disable</param>
+    <param name="package-meta">yes</param>
+  </service>
+  <service name="set_version" mode="manual">
+  </service>
+  <service name="tar" mode="buildtime">
+    <param name="package-meta">yes</param>
+  </service>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">gz</param>
   </service>
 </services>
diff --git a/ansible-builder-3.0.1.tar.gz b/ansible-builder-3.0.1.tar.gz
deleted file mode 100644
index 1753f16..0000000
--- a/ansible-builder-3.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af1ca1823f4269def9d6d3c0a6d0932c2b5740b51769162fdfd6e4a05cf38ce9
-size 94539
diff --git a/ansible-builder-3.1.0.obscpio b/ansible-builder-3.1.0.obscpio
new file mode 100644
index 0000000..65b0c23
--- /dev/null
+++ b/ansible-builder-3.1.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a658a29c59b8827f48007a4bcf180e724d89afc3eab5cbcf99ad9d81b3824e7f
+size 1081868
diff --git a/ansible-builder.changes b/ansible-builder.changes
index 3a44f59..98ba227 100644
--- a/ansible-builder.changes
+++ b/ansible-builder.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Jun 21 19:17:51 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
+
+- switch to using a git checkout instead of the PyPI tarball
+  without checksum
+- update to 3.1.0:
+  * New Features
+    - Support for tags from the configuration file by @Akasurde in
+      #555
+    - Support multiple -v for verbosity by @Shrews in #564
+    - Allow the .yaml file extension on the default EE file by
+      @Shrews in #631
+    - Account for PEP668 in pip invocations by @Shrews in #627
+    - Expose a way to exclude dependencies by @Shrews in #664
+    - Support extra build command args by @Shrews in #677
+  * Other Improvements
+    - Various improvements to documentation.
+    - Warn if USER directive is found in additional_build_steps by
+      @Akasurde in #528
+    - Warn about version less than 3 by @Akasurde in #574
+    - Warn user about using default base image in v3 by @Akasurde
+      in #591
+    - Fix container policy for version 3 by @Shrews in #652
+    - Guarantee collection base path exists by @Shrews in #683
+
 -------------------------------------------------------------------
 Sat Feb 24 13:08:34 UTC 2024 - Johannes Kastl <opensuse_buildservice@ojkastl.de>
 
diff --git a/ansible-builder.obsinfo b/ansible-builder.obsinfo
new file mode 100644
index 0000000..1f23203
--- /dev/null
+++ b/ansible-builder.obsinfo
@@ -0,0 +1,4 @@
+name: ansible-builder
+version: 3.1.0
+mtime: 1718893844
+commit: 68707471bf690a10a362b21ab5eabd4732124e10
diff --git a/ansible-builder.spec b/ansible-builder.spec
index 0e99cdc..6090aad 100644
--- a/ansible-builder.spec
+++ b/ansible-builder.spec
@@ -38,13 +38,14 @@
 %endif
 
 Name:           ansible-builder
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 Summary:        An Ansible execution environment builder
 License:        Apache-2.0
 URL:            https://github.com/ansible/ansible-builder
-Source:         https://files.pythonhosted.org/packages/source/a/ansible-builder/ansible-builder-%{version}.tar.gz
+Source:         ansible-builder-%{version}.tar.gz
 BuildArch:      noarch
+BuildRequires:  git-core
 # https://github.com/ansible/ansible-builder/blob/devel/setup.cfg#L41
 BuildRequires:  %{ansible_python}-base >= 3.9
 BuildRequires:  %{ansible_python}-pip
@@ -58,8 +59,8 @@ BuildRequires:  %{ansible_python}-PyYAML
 BuildRequires:  %{ansible_python}-bindep
 BuildRequires:  %{ansible_python}-filelock
 BuildRequires:  %{ansible_python}-jsonschema
+BuildRequires:  %{ansible_python}-packaging
 BuildRequires:  %{ansible_python}-pbr
-BuildRequires:  %{ansible_python}-requirements-parser
 #
 # Tests require podman, but also require connectivity to pull container images
 # hence we do not enable this dependency
@@ -75,7 +76,7 @@ BuildRequires:  fdupes
 Requires:       %{ansible_python}-PyYAML
 Requires:       %{ansible_python}-bindep
 Requires:       %{ansible_python}-jsonschema
-Requires:       %{ansible_python}-requirements-parser
+Requires:       %{ansible_python}-packaging
 Requires:       (podman or docker)
 
 %description