Переглянути джерело

Remove the osx version requirements on install due to a messy Installer
situation between pre-panther, tiger and beyond, and metapackages.


svn:r6672

Andrew Lewman 19 роки тому
батько
коміт
03bea739f8
2 змінених файлів з 1 додано та 16 видалено
  1. 0 15
      contrib/osx/TorBundleInfo.plist.in
  2. 1 1
      contrib/osx/package.sh

+ 0 - 15
contrib/osx/TorBundleInfo.plist.in

@@ -12,21 +12,6 @@
 	<string>@VERSION@</string>
 	<key>IFPkgFlagComponentDirectory</key>
 	<string>../.contained_packages</string>
-	<key>IFRequirementDicts</key>
-	<array>
-		<dict>
-		        <key>SpecType</key>
-			<string>plist</string>
-			<key>SpecArgument</key>
-			<string>/System/Library/CoreServices/SystemVersion.plist</string>
-			<key>SpecProperty</key>
-			<string>ProductVersion</string>
-			<key>TestOperator</key>
-			<string>&gt;=</string>
-			<key>TestObject</key>
-			<string>OSVER</string>
-		</dict>
-	</array>
 	<key>IFPkgFlagPackageList</key>
 	<array>
 		<dict>

+ 1 - 1
contrib/osx/package.sh

@@ -149,7 +149,7 @@ mkdir -p "$MPKG/Contents/Resources"
 echo -n "pmkrpkg1" > "$MPKG/Contents/PkgInfo"
 cp contrib/osx/ReadMe.rtf "$MPKG/Contents/Resources"
 #cp contrib/osx/License.rtf "$MPKG/Contents/Resources"
-sed -E -e "s/OSVER/$OSVER/" contrib/osx/TorBundleInfo.plist > "$MPKG/Contents/Info.plist"
+cp contrib/osx/TorBundleInfo.plist "$MPKG/Contents/Info.plist"
 cp contrib/osx/TorBundleWelcome.rtf "$MPKG/Contents/Resources/Welcome.rtf"
 cp contrib/osx/TorBundleDesc.plist "$MPKG/Contents/Resources/Description.plist"
 cp contrib/osx/tor_logo.gif "$MPKG/Contents/Resources/background.gif"