[or-cvs] Remove the osx version requirements on install due to a mes...
phobos at seul.org
phobos at seul.org
Wed Jun 21 02:27:20 UTC 2006
Update of /home/or/cvsroot/tor/contrib/osx
In directory moria:/tmp/cvs-serv26217
Modified Files:
TorBundleInfo.plist.in package.sh
Log Message:
Remove the osx version requirements on install due to a messy Installer
situation between pre-panther, tiger and beyond, and metapackages.
Index: TorBundleInfo.plist.in
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/TorBundleInfo.plist.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -d -r1.5 -r1.6
--- TorBundleInfo.plist.in 20 Jun 2006 04:18:47 -0000 1.5
+++ TorBundleInfo.plist.in 21 Jun 2006 02:27:18 -0000 1.6
@@ -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>>=</string>
- <key>TestObject</key>
- <string>OSVER</string>
- </dict>
- </array>
<key>IFPkgFlagPackageList</key>
<array>
<dict>
Index: package.sh
===================================================================
RCS file: /home/or/cvsroot/tor/contrib/osx/package.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -d -r1.21 -r1.22
--- package.sh 20 Jun 2006 04:16:46 -0000 1.21
+++ package.sh 21 Jun 2006 02:27:18 -0000 1.22
@@ -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"
More information about the tor-commits
mailing list