From 4a726208af264f4553c7fd550a8cbbb34f6a9f7c Mon Sep 17 00:00:00 2001
From: Jakob Rath <git@jakobrath.eu>
Date: Mon, 26 Feb 2024 12:02:49 +0100
Subject: [PATCH] bad merge?

---
 scripts/mk_nuget_task.py | 9 ---------
 src/api/python/setup.py  | 7 ++++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/scripts/mk_nuget_task.py b/scripts/mk_nuget_task.py
index 515488d5e..9de592c08 100644
--- a/scripts/mk_nuget_task.py
+++ b/scripts/mk_nuget_task.py
@@ -96,11 +96,7 @@ def mk_targets(source_root):
 def mk_icon(source_root):
     mk_dir("out/content")
     shutil.copy(f"{source_root}/resources/icon.jpg", "out/content/icon.jpg")
-<<<<<<< HEAD
 #   shutil.copy(f"{source_root}/src/api/dotnet/README.md", "out/content/README.md")
-=======
-    shutil.copy(f"{source_root}/src/api/dotnet/README.md", "out/content/README.md")
->>>>>>> bdc40b1f5f83cca22dc1d6c5808e935a3b50176c
 
 
     
@@ -121,7 +117,6 @@ Linux Dependencies:
         <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
         <tags>smt constraint solver theorem prover</tags>
         <icon>content/icon.jpg</icon>
-        <readme>content/README.md</readme>
         <projectUrl>https://github.com/Z3Prover/z3</projectUrl>
         <license type="expression">MIT</license>
         <repository type="git" url="{1}" branch="{2}" commit="{3}" />
@@ -131,10 +126,6 @@ Linux Dependencies:
             <group targetFramework=".netstandard2.0" />
         </dependencies>
     </metadata>
-    <files>
-      <file src="content/README.md" target="content/README.md"/>
-      <file src="content/icon.jpg" target="content/icon.jpg"/>
-    </files>
 </package>""".format(version, repo, branch, commit, arch)
     print(contents)
     sym = "sym." if symbols else ""
diff --git a/src/api/python/setup.py b/src/api/python/setup.py
index 73a6ce726..c3f65f848 100644
--- a/src/api/python/setup.py
+++ b/src/api/python/setup.py
@@ -313,11 +313,12 @@ if 'bdist_wheel' in sys.argv and '--plat-name' not in sys.argv:
             osver = RELEASE_METADATA[3]
             if osver.count('.') > 1:
                 osver = '.'.join(osver.split('.')[:2])
-            osver = osver.replace('.','_')
+            if osver.startswith("11"):
+                osver = "11_0"
             if arch == 'x64':
-                plat_name ='macosx_%s_x86_64' % re.sub(r'\A(1[1-9])(_[\d]+)*\Z', r'\1_0', osver)
+                plat_name ='macosx_%s_x86_64' % osver.replace('.', '_')
             elif arch == 'arm64':
-                plat_name ='macosx_%s_arm64' % osver
+                plat_name ='macosx_%s_arm64' % osver.replace('.', '_')
             else:
                 raise Exception(f"idk how os {distos} {osver} works. what goes here?")
         else: