Set the minimum OS X version in the installer package based on the

deployment target; if --disable-osx-deploy-target was specified, set it
to the OS version on which we're building - minor/dot-dot version and
all - as there's no guarantee that it'll work on *any* version earlier
than that.

svn path=/trunk/; revision=51060

diff --git a/configure.ac b/configure.ac
index a82c0c44244d799ea5a21619f9b58212a1ee8219..b139f09b85f6685d20712e304c898533caff4390 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,12 @@ then
        #
        OSX_DEPLOY_TARGET="MACOSX_DEPLOYMENT_TARGET=$deploy_target"
 
        #
        OSX_DEPLOY_TARGET="MACOSX_DEPLOYMENT_TARGET=$deploy_target"
 

+       #
+       # In the installer package XML file, give the deployment target
+       # as the minimum version.
+       #
+       OSX_MIN_VERSION="$deploy_target"
+

        case $deploy_target in
 
        10.4|10.5)
        case $deploy_target in
 
        10.4|10.5)


@@ -429,7 +435,17 @@ then
                LDFLAGS="-arch i386 $LDFLAGS"
                ;;
        esac
                LDFLAGS="-arch i386 $LDFLAGS"
                ;;
        esac

+else
+       #
+       # In the installer package XML file, give the current OS
+       # version, minor version and all, as the minimum version.
+       # We can't guarantee that the resulting binary will work
+       # on older OS versions, not even older minor versions
+       # (original release or earlier software updates).
+       #
+       OSX_MIN_VERSION=`sw_vers -productVersion`

 fi
 fi

+AC_SUBST(OSX_MIN_VERSION)

 
 #
 # Try to arrange for large file support.
 
 #
 # Try to arrange for large file support.


@@ -2747,6 +2763,7 @@ AC_OUTPUT(
   packaging/macosx/Info.plist
   packaging/macosx/Makefile
   packaging/macosx/osx-dmg.sh
   packaging/macosx/Info.plist
   packaging/macosx/Makefile
   packaging/macosx/osx-dmg.sh

+  packaging/macosx/Wireshark_package.pmdoc/index.xml

   packaging/nsis/Makefile
   packaging/rpm/Makefile
   packaging/rpm/SPECS/Makefile
   packaging/nsis/Makefile
   packaging/rpm/Makefile
   packaging/rpm/SPECS/Makefile

diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am
index 0475d4085a5c9fc2c9f4e9c16055f9c5fa22ec8c..29a468da693fc9d77e1f75984226a969584ae248 100644 (file)
--- a/packaging/macosx/Makefile.am
+++ b/packaging/macosx/Makefile.am
@@ -87,7 +87,7 @@ EXTRA_DIST = \
        Wireshark_package.pmdoc/02chmodbpf.xml                  \
        Wireshark_package.pmdoc/03utility-contents.xml          \
        Wireshark_package.pmdoc/03utility.xml                   \
        Wireshark_package.pmdoc/02chmodbpf.xml                  \
        Wireshark_package.pmdoc/03utility-contents.xml          \
        Wireshark_package.pmdoc/03utility.xml                   \

-       Wireshark_package.pmdoc/index.xml
+       Wireshark_package.pmdoc/index.xml.in

 
 
 COPYING.txt: ../../COPYING
 
 
 COPYING.txt: ../../COPYING

diff --git a/packaging/macosx/Wireshark_package.pmdoc/index.xml b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
similarity index 70%
rename from packaging/macosx/Wireshark_package.pmdoc/index.xml
rename to packaging/macosx/Wireshark_package.pmdoc/index.xml.in
index a05d1414fa7783b16b2ce8e779bf84b85d5229ae..ba2f8a6125234b750db5f66fe1128f8e46c1213e 100644 (file)
--- a/packaging/macosx/Wireshark_package.pmdoc/index.xml
+++ b/packaging/macosx/Wireshark_package.pmdoc/index.xml.in
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.5.5'"><message-title>Failure</message-title><message>This package requires Mac OS X 10.5.5 or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>
\ No newline at end of file
+<pkmkdoc spec="1.12"><properties><title>Wireshark</title><build>Wireshark.pkg</build><organization>org.wireshark</organization><userSees ui="both"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>Wireshark (requires X11) and associated command line utilities.</description><contents><choice title="Wireshark" id="wireshark" tooltip="The Wireshark network protocol analyzer" description="The main Wireshark application" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.Wireshark.pkg"/></choice><choice title="Set capture permissions at startup" id="chmodbpf" tooltip="Install the ChmodBPF startup item and add an access_bpf group" description="This installs a startup item (ChmodBPF) that changes the group permissions of each BPF device to allow access for the &quot;access_bpf&quot; group. It creates the &quot;access_bpf&quot; group if it doesn't exist and adds the current user to the group." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.ChmodBPF.pkg"/></choice><choice title="Command line utilities" id="cli" tooltip="Command line utilities associated with Wireshark" description="Various utilities associated with Wireshark including TShark, dumpcap, mergecap, capinfos, and editcap." starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="org.wireshark.cli.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" type="license">COPYING.txt</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'@OSX_MIN_VERSION@'"><message-title>Failure</message-title><message>This package requires Mac OS X @OSX_MIN_VERSION@ or later. If you cannot upgrade you might try installing using MacPorts or Fink.</message></requirement></requirements><flags/><extra-files/><item type="file">01wireshark.xml</item><item type="file">02chmodbpf.xml</item><item type="file">03utility.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>properties.customizeOption</mod><mod>extraFiles</mod><mod>postinstallActions.actions</mod><mod>properties.systemDomain</mod></pkmkdoc>