fix whois: URL queries; make SVG support optional and disabled by default as Firefox 1.0.4 is incompatible with current Cairo 0.5; fix indentation; align options with Mozilla package; provide updated logos which now include both the fox in the firefox logo and an updated OpenPKG logo

firefox/firefox.sh

@@ -130,7 +130,7 @@ for url in "$@"; do
             whois:* )
                 #   expand Geektools.com WHOIS query
                 url=`echo "$url" | sed -e 's;^whois:;;'`
-                url="http://www.geektools.com/cgi-bin/proxy.cgi?query=$url"
+                url="http://www.whois-search.com/whois/$url"
                 ;;
             jargon:* )
                 #   expand UMEC Jargon File query

firefox/firefox.spec

@@ -33,10 +33,11 @@ Class:        EVAL
 Group:        Web
 License:      MPL
 Version:      1.0.4
-Release:      20050512
+Release:      20050612
 
 #   package options
 %option       with_optimize   yes
+%option       with_svg        no
 
 #   list of sources
 Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
@@ -53,8 +54,12 @@ BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc, perl, pkgconfig
 PreReq:       OpenPKG, openpkg >= 20040130, xsel, wmctrl
 BuildPreReq:  X11, glib, gtk, png, jpeg, orbit, libiconv
 PreReq:       X11, glib, gtk, png, jpeg, orbit, libiconv
-BuildPreReq:  infozip, zlib, openssl, freetype, cairo, cairo::with_x11 = yes
-PreReq:       infozip, zlib, openssl, freetype, cairo, cairo::with_x11 = yes
+BuildPreReq:  infozip, zlib, openssl, freetype
+PreReq:       infozip, zlib, openssl, freetype
+%if "%{with_svg}" == "yes"
+BuildPreReq:  cairo, cairo::with_x11 = yes
+PreReq:       cairo, cairo::with_x11 = yes
+%endif
 AutoReq:      no
 AutoReqProv:  no
 
@@ -136,7 +141,7 @@ AutoReqProv:  no
                 -e "s;\(LDFLAGS += -L\)@l_gccinst@;\1$libgccpath;" \
                 embedding/browser/gtk/tests/Makefile.in \
                 browser/app/Makefile.in
-        ;;
+            ;;
     esac
 
     #   specify custom extensions, leaving out the broken 'typeaheadfind'
@@ -171,8 +176,12 @@ AutoReqProv:  no
         --enable-jsd \
         --enable-crypto \
         --enable-chrome-format=jar \
+%if "%{with_svg}" == "yes"
         --enable-svg \
         --enable-svg-renderer-cairo \
+%else
+        --disable-svg \
+%endif
         --enable-static \
         --enable-strip \
 %if "%{with_optimize}" == "yes"
@@ -199,8 +208,6 @@ AutoReqProv:  no
         --disable-xterm-updates \
         --disable-elf-dynstr-gc \
         --disable-installer \
-        --disable-profilesharing \
-        --enable-single-profile \
         --with-pthreads
 
     #   build program