From 43377e47c5f3587eb20eb15d69b0a2948b6225cb Mon Sep 17 00:00:00 2001
From: ojkastl_buildservice <>
Date: Dec 19 2022 13:14:18 +0000
Subject: Update ansible to version 7.1.0 / rev 90 via SR 1043662


https://build.opensuse.org/request/show/1043662
by user ojkastl_buildservice + dimstar_suse

---

diff --git a/.files b/.files
index 21c3ac4..794e60e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index fdf9e09..2459ea8 100644
--- a/.rev
+++ b/.rev
@@ -947,4 +947,12 @@ numbers for further reference.
     <comment></comment>
     <requestid>1041718</requestid>
   </revision>
+  <revision rev="90" vrev="2">
+    <srcmd5>9c5cf795a10f6531331d77ace3eb8bad</srcmd5>
+    <version>7.1.0</version>
+    <time>1671455278</time>
+    <user>dimstar_suse</user>
+    <comment></comment>
+    <requestid>1043662</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index 290da5e..badb26a 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-18ecff1da0320ccd8732f54bd4020142
+90cf22f9b7b44a2456149a12a949408b
diff --git a/ansible.changes b/ansible.changes
index a01fbf3..1237746 100644
--- a/ansible.changes
+++ b/ansible.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Sun Dec 18 20:23:17 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
+
+- disable automatic generation of RPM dependencies from files in collections
+  The files are not meant to be executed on the Ansible controller
+  (i.e. the machine where this package is being installed), but rather
+  on the targets that get modified. So e.g. python2 is not needed as
+  a dependency on the ansible controller
+- do no longer change shebangs in files from collections
+
+-------------------------------------------------------------------
 Thu Dec  8 14:32:29 UTC 2022 - Johannes Kastl <kastl@b1-systems.de>
 
 - update to 7.1.0:
diff --git a/ansible.spec b/ansible.spec
index e7d2e2e..f62f58a 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -51,6 +51,10 @@ BuildRequires:  ansible-core >= 2.14.1
 
 Requires:       %{ansible_python}-base >= 3.9
 Requires:       ansible-core >= 2.14.1
+
+# Do not check any files in collections for requires
+%global __requires_exclude_from ^%{ansible_python_sitelib}/.*$
+
 BuildArch:      noarch
 
 %description
@@ -70,13 +74,6 @@ done
 # fix for wrong shebang:
 sed -i 's|/Users/kbreit/Documents/Programming/ansible_collections/cisco/meraki/venv/bin/python|%{_bindir}/%{ansible_python_executable}|g' ansible_collections/cisco/meraki/scripts/sublime-build/build.py.generic
 
-# Replace all #!/usr/bin/env lines to use #!/usr/bin/$1 directly.
-find ./ -type f -exec \
-    sed -i '1s|^#!%{_bindir}/env |#!%{_bindir}/|' {} \;
-
-find ./ -type f -exec \
-    sed -i '1s|python$|%{ansible_python_executable}|' {} \;
-
 # remove .keep and .gitignore files
 find ./ansible_collections/ -iname .gitignore -delete
 find ./ansible_collections/ -iname .keep -delete