aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-06-21 02:27:18 +0000
committerAndrew Lewman <andrew@torproject.org>2006-06-21 02:27:18 +0000
commit03bea739f8d473b3362a3f1b8b8bfe6222293238 (patch)
tree1d968ff9366b51f39c090deb83c935cc35cef9a6
parent7b6c4350661a9772ac75de9f6ed2afb769a53406 (diff)
downloadtor-03bea739f8d473b3362a3f1b8b8bfe6222293238.tar
tor-03bea739f8d473b3362a3f1b8b8bfe6222293238.tar.gz
Remove the osx version requirements on install due to a messy Installer
situation between pre-panther, tiger and beyond, and metapackages. svn:r6672
-rw-r--r--contrib/osx/TorBundleInfo.plist.in15
-rw-r--r--contrib/osx/package.sh2
2 files changed, 1 insertions, 16 deletions
diff --git a/contrib/osx/TorBundleInfo.plist.in b/contrib/osx/TorBundleInfo.plist.in
index a36c202db..16cc83694 100644
--- a/contrib/osx/TorBundleInfo.plist.in
+++ b/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>
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 4715c7350..1012163a0 100644
--- a/contrib/osx/package.sh
+++ b/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"