OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   23-Dec-2003 11:38:46
  Branch: HEAD                             Handle: 2003122310384302

  Added files:
    openpkg-src/mozilla     mailnews.patch
  Modified files:
    openpkg-src/mozilla     mozilla.spec
    openpkg-web             news.txt

  Log:
    add rudimentary support for mail client in OpenPKG native wrapper
    script

  Summary:
    Revision    Changes     Path
    1.1         +36 -0      openpkg-src/mozilla/mailnews.patch
    1.76        +6  -2      openpkg-src/mozilla/mozilla.spec
    1.7872      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mozilla/mailnews.patch
  ============================================================================
  $ cvs diff -u -r0 -r1.1 mailnews.patch
  --- /dev/null 2003-12-23 11:38:45.000000000 +0100
  +++ mailnews.patch    2003-12-23 11:38:45.000000000 +0100
  @@ -0,0 +1,36 @@
  +Index: mozilla.sh
  +--- mozilla.sh       2003-12-23 11:02:45.000000000 +0100
  ++++ mozilla.sh       2003-12-23 10:58:29.000000000 +0100
  +@@ -36,9 +36,10 @@
  + opt_r=""
  + while [ ".$1" != . ]; do
  +     case $1 in
  +-        -v|--verbose ) opt_v=yes; shift ;;
  +-        -w|--window  ) opt_w=yes; shift ;;
  +-        -t|--tab     ) opt_t=yes; shift ;;
  ++        -m|-mail|--mail ) opt_m=yes; shift ;;
  ++        -v|--verbose    ) opt_v=yes; shift ;;
  ++        -w|--window     ) opt_w=yes; shift ;;
  ++        -t|--tab        ) opt_t=yes; shift ;;
  +         -r|-remote|--remote ) opt_r="$2"; shift; shift ;;
  +         -* ) echo "$0:ERROR: invalid option \"$1\"" 1>&2; exit 1 ;;
  +         * ) break ;;
  +@@ -66,6 +67,18 @@
  +     exec $mozilla_bin -remote "$opt_r"
  + fi
  + 
  ++#   special case of direct email option
  ++if [ ".$opt_m" != . ]; then
  ++    $mozilla_bin -remote "ping()" >/dev/null 2>&1
  ++    if [ $? -eq 0 ]; then
  ++        verbose "$mozilla_bin -remote \"xfeDoCommand(openInbox)\""
  ++        $mozilla_bin -remote "xfeDoCommand(openInbox)"
  ++    else
  ++        verbose "exec: $mozilla_bin -mail"
  ++        exec $mozilla_bin -mail
  ++    fi
  ++fi
  ++
  + #   determine Mozilla run-time status
  + $mozilla_bin -remote "ping()" >/dev/null 2>&1
  + if [ $? -eq 0 ]; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mozilla/mozilla.spec
  ============================================================================
  $ cvs diff -u -r1.75 -r1.76 mozilla.spec
  --- openpkg-src/mozilla/mozilla.spec  21 Dec 2003 09:26:47 -0000      1.75
  +++ openpkg-src/mozilla/mozilla.spec  23 Dec 2003 10:38:45 -0000      1.76
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      MPL
   Version:      1.5.1
  -Release:      20031221
  +Release:      20031223
   
   #   package options
   %option       with_optimize   yes
  @@ -45,6 +45,7 @@
   Source1:      ftp://ftp.openpkg.org/sources/CPY/mozilla/mozilla-1.4-libart.tar.bz2
   Source2:      mozilla.sh
   Source3:      mozilla.pod
  +Source4:      mailnews.patch
   Patch0:       mozilla.patch
   
   #   build information
  @@ -74,8 +75,11 @@
       %setup -q -n mozilla
       %setup -q -n mozilla -D -T -a 1
   
  -    #   patch source distribution
  +    #   patch source distribution and OpenPKG wrapper
       %patch -p0
  +%if "%{with_mailnews}" == "yes"
  +    %{l_patch} <%{SOURCE mailnews.patch} %{SOURCE mozilla.sh}
  +%endif
   
       #   strip down source distribution (save disk space)
       find . -type d -name "CVS" -print | xargs rm -rf
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7871 -r1.7872 news.txt
  --- openpkg-web/news.txt      23 Dec 2003 09:21:25 -0000      1.7871
  +++ openpkg-web/news.txt      23 Dec 2003 10:38:43 -0000      1.7872
  @@ -1,3 +1,4 @@
  +23-Dec-2003: Upgraded package: P<mozilla-1.5.1-20031223>
   23-Dec-2003: Upgraded package: P<gocr-0.38-20031223>
   23-Dec-2003: Upgraded package: P<lftp-2.6.11-20031223>
   23-Dec-2003: Upgraded package: P<epm-3.7-20031223>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to