From f80fb44b67d748419a38cb864eeb615ed83f6963 Mon Sep 17 00:00:00 2001
From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 22 Feb 2021 19:17:00 +0100
Subject: [PATCH] macos: rework the plist and rename apple to macos in
 repository

---
 CMakeLists.txt                                |   4 +-
 setup/apple/Contents/Info.plist               |  28 --------------
 setup/{apple => macos}/.gitignore             |   0
 setup/macos/Contents/Info.plist               |  36 ++++++++++++++++++
 .../Contents/Resources/netradiant.icns        | Bin
 setup/{apple/netradiant => macos/NetRadiant}  |   0
 6 files changed, 38 insertions(+), 30 deletions(-)
 delete mode 100644 setup/apple/Contents/Info.plist
 rename setup/{apple => macos}/.gitignore (100%)
 create mode 100644 setup/macos/Contents/Info.plist
 rename setup/{apple => macos}/Contents/Resources/netradiant.icns (100%)
 rename setup/{apple/netradiant => macos/NetRadiant} (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94136b8c..b01730e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -530,7 +530,7 @@ endif ()
 
 if (APPLE)
     install(DIRECTORY
-        setup/apple/Contents
+        setup/macos/Contents
         DESTINATION ${APPLE_INSTALL_PREFIX}
     )
     install(DIRECTORY
@@ -538,7 +538,7 @@ if (APPLE)
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/Prefix/share
     )
     install(PROGRAMS
-        setup/apple/netradiant
+        setup/macos/NetRadiant
         DESTINATION ${APPLE_INSTALL_PREFIX}/Contents/MacOS
     )
 endif ()
diff --git a/setup/apple/Contents/Info.plist b/setup/apple/Contents/Info.plist
deleted file mode 100644
index 3a8348e1..00000000
--- a/setup/apple/Contents/Info.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-        <key>CFBundleDisplayName</key>
-        <string>NetRadiant</string>
-        <key>CFBundleExecutable</key>
-        <string>netradiant</string>
-        <key>CFBundleIconFile</key>
-        <string>netradiant.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>org.xonotic.netradiant</string>
-        <key>CFBundleName</key>
-        <string>NetRadiant</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.5.0</string>
-        <key>CFBundleVersion</key>
-        <string>1.5.0</string>
-        <key>LSMinimumSystemVersion</key>
-        <string>10.7</string>
-        <key>NSHighResolutionCapable</key>
-        <false/>
-</dict>
-</plist>
diff --git a/setup/apple/.gitignore b/setup/macos/.gitignore
similarity index 100%
rename from setup/apple/.gitignore
rename to setup/macos/.gitignore
diff --git a/setup/macos/Contents/Info.plist b/setup/macos/Contents/Info.plist
new file mode 100644
index 00000000..1cc3d745
--- /dev/null
+++ b/setup/macos/Contents/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleName</key>
+	<string>NetRadiant</string>
+	<key>CFBundleDisplayName</key>
+	<string>NetRadiant</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.xonotic.netradiant</string>
+	<key>CFBundleExecutable</key>
+	<string>NetRadiant</string>
+	<key>CFBundleIconFile</key>
+	<string>netradiant.icns</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.5.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.5.0</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleTypeExtensions</key>
+	<array>
+		<string>map</string>
+	</array>
+	<key>NSHighResolutionCapable</key>
+	<false/>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7</string>
+</dict>
+</plist>
diff --git a/setup/apple/Contents/Resources/netradiant.icns b/setup/macos/Contents/Resources/netradiant.icns
similarity index 100%
rename from setup/apple/Contents/Resources/netradiant.icns
rename to setup/macos/Contents/Resources/netradiant.icns
diff --git a/setup/apple/netradiant b/setup/macos/NetRadiant
similarity index 100%
rename from setup/apple/netradiant
rename to setup/macos/NetRadiant
-- 
2.39.2