From 95eb8cbcfc0fc5ca4c784efa126b3aa3dafacefd Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Mon, 21 Mar 2022 14:28:15 +1100
Subject: CPack: Avoid space / tab mix in productbuild distribution.xml
 template

---
 Modules/Internal/CPack/CPack.distribution.dist.in | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Modules/Internal')

diff --git a/Modules/Internal/CPack/CPack.distribution.dist.in b/Modules/Internal/CPack/CPack.distribution.dist.in
index f20e66c170..e04f7bf9da 100644
--- a/Modules/Internal/CPack/CPack.distribution.dist.in
+++ b/Modules/Internal/CPack/CPack.distribution.dist.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <installer-gui-script minSpecVersion="1.0">
-    <title>@CPACK_PACKAGE_NAME@</title>
-    <welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
-    <readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
-    <license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
-    <options allow-external-scripts="no" customize="allow" rootVolumeOnly="false"></options>
-    @CPACK_PACKAGEMAKER_CHOICES@
+	<title>@CPACK_PACKAGE_NAME@</title>
+	<welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
+	<readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
+	<license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
+	<options allow-external-scripts="no" customize="allow" rootVolumeOnly="false"></options>
+	@CPACK_PACKAGEMAKER_CHOICES@
 </installer-gui-script>
-- 
cgit v1.2.1


From 2a8df7e7db2ecef9652ab27371c5dbfbc56b2617 Mon Sep 17 00:00:00 2001
From: Craig Scott <craig.scott@crascit.com>
Date: Mon, 21 Mar 2022 15:42:46 +1100
Subject: productbuild: Don't write rootVolumeOnly attribute if writing domains

The rootVolumeOnly attribute is deprecated. Apple docs say to use
domains instead.

Fixes: #23343
---
 Modules/Internal/CPack/CPack.distribution.dist.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Modules/Internal')

diff --git a/Modules/Internal/CPack/CPack.distribution.dist.in b/Modules/Internal/CPack/CPack.distribution.dist.in
index e04f7bf9da..291b24d48f 100644
--- a/Modules/Internal/CPack/CPack.distribution.dist.in
+++ b/Modules/Internal/CPack/CPack.distribution.dist.in
@@ -4,6 +4,5 @@
 	<welcome file="@CPACK_RESOURCE_FILE_WELCOME_NOPATH@"/>
 	<readme file="@CPACK_RESOURCE_FILE_README_NOPATH@"/>
 	<license file="@CPACK_RESOURCE_FILE_LICENSE_NOPATH@"/>
-	<options allow-external-scripts="no" customize="allow" rootVolumeOnly="false"></options>
-	@CPACK_PACKAGEMAKER_CHOICES@
+@CPACK_APPLE_PKG_INSTALLER_CONTENT@
 </installer-gui-script>
-- 
cgit v1.2.1