switch to %option(s); remove trailing whitespaces; add jargon query support

mozilla/mozilla.sh

@@ -133,6 +133,11 @@ for url in "$@"; do
                 url=`echo "$url" | sed -e 's;^whois:;;'`
                 url="http://www.geektools.com/cgi-bin/proxy.cgi?query=$url"
                 ;;
+            jargon:* )
+                #   expand UMEC Jargon File query
+                url=`echo "$url" | sed -e 's;^jargon:;;' | tr ' ' '+'`
+                url="http://www.tf.hut.fi/cgi-bin/jargon?search=$url"
+                ;;
             /* ) 
                 #   expand absolute filename into file URL
                 url="file://$url"

mozilla/mozilla.spec

@@ -24,12 +24,8 @@
 ##
 
 #   package options
-%ifndef       with_mailnews
-%define       with_mailnews   no
-%endif
-%ifndef       with_composer
-%define       with_composer   no
-%endif
+%option       with_mailnews   no
+%option       with_composer   no
 
 #   package information
 Name:         mozilla
@@ -41,7 +37,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Web
 License:      MPL
 Version:      1.2.1
-Release:      20021226
+Release:      20030101
 
 #   list of sources
 Source0:      ftp://ftp.mozilla.org/pub/mozilla/releases/mozilla%{version}/src/mozilla-source-%{version}.tar.bz2
@@ -53,8 +49,8 @@ Patch0:       mozilla.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, make, gcc, perl
-PreReq:       OpenPKG, openpkg >= 20021204, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, xsel
+BuildPreReq:  OpenPKG, openpkg >= 20021230, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, make, gcc, perl
+PreReq:       OpenPKG, openpkg >= 20021230, X11, glib, gtk, orbit, libiconv, infozip, openssl, freetype, xsel
 AutoReq:      no
 AutoReqProv:  no
 
@@ -169,7 +165,7 @@ AutoReqProv:  no
       %{l_shtool} subst \
           -e "s;`pwd`;%{l_prefix}/lib/mozilla;" \
           components/xpti.dat components/compreg.dat
-      
+
       #    strip down installation tree
       find . -type d -depth -print | xargs rmdir >/dev/null 2>&1 || true
       rm -f mozilla-config mkdepend nsinstall bloaturls.txt TestGtk* LICENSE README