dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-mozilla-20080327.tar.bz2

.gitignore

@@ -0,0 +1 @@
+xulrunner-1.9.0.11-source.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xulrunner
-# $Id$
-NAME := xulrunner
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

find-external-requires

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Finds requirements provided outside of the current file set
-
-filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-
-provides=`echo $filelist | /usr/lib/rpm/find-provides`
-
-{
-for f in $filelist ; do
-	echo $f | /usr/lib/rpm/find-requires | while read req ; do
-		found=0
-		for p in $provides ; do
-			if [ "$req" = "$p" ]; then
-				found=1
-			fi
-		done
-		if [ "$found" = "0" ]; then
-			echo $req
-		fi
-	done
-done
-} | sort -u

mozilla-about-firefox-version.patch

@@ -0,0 +1,12 @@
+diff -up mozilla/toolkit/content/Makefile.in.fix mozilla/toolkit/content/Makefile.in
+--- mozilla/toolkit/content/Makefile.in.fix	2008-03-13 20:25:52.000000000 +0100
++++ mozilla/toolkit/content/Makefile.in	2008-10-24 16:17:43.000000000 +0200
+@@ -45,7 +45,7 @@ CHROME_DEPS = buildconfig.html
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
++DEFINES += -DMOZ_APP_VERSION=$(FIREFOX_VERSION)
+ 
+ ifdef ENABLE_TESTS
+ DIRS += tests

mozilla-mochitest.patch

@@ -0,0 +1,21 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=429178
+
+Index: mozilla/testing/mochitest/ssltunnel/Makefile.in
+===================================================================
+RCS file: /cvsroot/mozilla/testing/mochitest/ssltunnel/Makefile.in,v
+retrieving revision 1.2
+diff -u -u -r1.2 Makefile.in
+--- mozilla/testing/mochitest/ssltunnel/Makefile.in	11 Apr 2008 05:58:04 -0000	1.2
++++ mozilla/testing/mochitest/ssltunnel/Makefile.in	3 Jun 2008 19:25:55 -0000
+@@ -55,6 +55,10 @@
+ 	nss \
+ 	$(NULL)
+ 
++# Use local includes because they are inserted before INCLUDES
++# so that Mozilla's nss.h is used, not glibc's
++LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS)
++
+ LIBS = \
+ 	$(NSPR_LIBS) \
+ 	$(NSS_LIBS) \
+

mozilla-pkgconfig.patch

@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
---- mozilla/config/autoconf.mk.in.pk	2008-01-22 03:50:04.000000000 +0100
-+++ mozilla/config/autoconf.mk.in	2008-01-29 17:18:01.000000000 +0100
+--- mozilla/config/autoconf.mk.in.pk	2008-05-05 23:08:14.000000000 +0200
++++ mozilla/config/autoconf.mk.in	2008-06-26 13:38:41.000000000 +0200
 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -19,19 +19,46 @@ diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
  
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-01-29 17:19:25.000000000 +0100
-@@ -1,5 +1,6 @@
+diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-06-26 13:41:12.000000000 +0200
+@@ -1,7 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
-+libdir=%libdir%
  includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/stable
+ includetype=stable
  
- Name: mozilla-gtkembedmoz
+ # Note: the default pkg-config cflags will only list include directories
+@@ -11,5 +11,6 @@ includetype=stable
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-06-26 13:41:25.000000000 +0200
+@@ -1,11 +1,12 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+-idldir=%idldir%
++idldir=%idldir%/unstable
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
++Requires: %NSPR_NAME% >= %NSPR_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
 --- mozilla/xulrunner/installer/libxul.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -50,20 +77,9 @@ diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer
 +Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom
  Cflags: -I${includedir}/${includetype} -fshort-wchar
 \ No newline at end of file
-diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-29 17:18:01.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in	2008-01-29 17:18:01.000000000 +0100
-@@ -117,6 +117,7 @@ endif
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
 --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -74,40 +90,40 @@ diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/
  includetype=unstable
  
  Name: libxul
-diff -up mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in	2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
+--- mozilla/xulrunner/installer/Makefile.in.pk	2008-04-10 16:50:48.000000000 +0200
++++ mozilla/xulrunner/installer/Makefile.in	2008-06-26 13:38:41.000000000 +0200
+@@ -116,6 +116,7 @@ endif
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
++	-e "s|%libdir%|$(installdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/unstable
- includetype=unstable
  
- Name: libxul-embedding-unstable
-diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
---- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-01-29 17:18:01.000000000 +0100
-@@ -1,7 +1,7 @@
+ Name: mozilla-gtkembedmoz
+diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2008-06-26 13:38:41.000000000 +0200
+@@ -1,5 +1,6 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
++libdir=%libdir%
  includedir=%includedir%
--idldir=%idldir%
-+idldir=%idldir%/stable
- includetype=stable
  
- # Note: the default pkg-config cflags will only list include directories
-@@ -11,5 +11,5 @@ includetype=stable
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
--Libs: -L${sdkdir}/lib -lxpcomglue
-+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
- Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+ Name: mozilla-gtkembedmoz
 diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
 --- mozilla/xulrunner/installer/mozilla-js.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -6,5 +6,5 @@ Name: JavaScript
  Description: The Mozilla JavaScript Library
  Version: %MOZILLA_VERSION%
@@ -116,19 +132,9 @@ diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/insta
 -Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
 +Libs: -L${sdkdir}/sdk/lib -lmozjs
 +Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
-diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk	2008-01-10 10:17:49.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	2008-01-29 17:19:04.000000000 +0100
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- 
- Name: mozilla-gtkembedmoz
 diff -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
 --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-29 17:18:01.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-06-26 13:38:41.000000000 +0200
 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%

mozilla-ps-pdf-simplify-operators.patch

@@ -0,0 +1,42 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=435313
+
+Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPDFSurface.h
+--- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPDFSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;
+Index: mozilla/gfx/thebes/public/gfxPSSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPSSurface.h
+--- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPSSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;

mozilla-sqlite.patch

@@ -0,0 +1,32 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=424063
+
+Index: mozilla/configure.in
+===================================================================
+RCS file: /cvsroot/mozilla/configure.in,v
+retrieving revision 1.1992
+diff -d -u -p -r1.1992 configure.in
+--- mozilla/configure.in	5 May 2008 21:08:14 -0000	1.1992
++++ mozilla/configure.in	17 May 2008 02:26:32 -0000
+@@ -5958,7 +5958,21 @@ then
+     SQLITE_CFLAGS=
+     SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
+ else
+-    PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
++    SQLITE_VERSION_NUMBER=3005004
++    AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION)
++    AC_TRY_COMPILE([#include <sqlite3.h>], [
++#                   if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER
++#                   error "sqlite version < $SQLITE_VERSION_NUMBER
++#                   endif
++                    ] , [res=yes], [res=no])
++    AC_MSG_RESULT([$res])
++    if test "$res" != "yes"; then
++        AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required])
++    fi
++    SQLITE_CFLAGS=`$PKG_CONFIG --cflags sqlite3`
++    SQLITE_LIBS=`$PKG_CONFIG --libs sqlite3`
++    AC_SUBST(SQLITE_CFLAGS)
++    AC_SUBST(SQLITE_LIBS)
+ fi
+ 
+ AC_SUBST(MOZ_NATIVE_SQLITE)

mozilla-ssl-exception.patch

@@ -0,0 +1,14 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=436870
+
+diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/src/nsCertOverrideService.h
+--- a/security/manager/ssl/src/nsCertOverrideService.h
++++ b/security/manager/ssl/src/nsCertOverrideService.h
+@@ -109,6 +109,7 @@
+     nsCertOverrideEntry(const nsCertOverrideEntry& toCopy)
+     {
+       mSettings = toCopy.mSettings;
++      mHostWithPort = toCopy.mHostWithPort;
+     }
+ 
+     ~nsCertOverrideEntry()
+

sources

@@ -1 +1 @@
-7f43fd0bdbf2709ba05cec41f43d2a36  mozilla-20080327.tar.bz2
+b509f7c05e9566ed290e2c098316c7c3  xulrunner-1.9.0.11-source.tar.bz2

xulrunner-mozconfig

@@ -11,9 +11,11 @@ ac_add_options --with-system-bz2
 ac_add_options --enable-system-lcms
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-cairo
 ac_add_options --with-pthreads
 ac_add_options --disable-strip
 ac_add_options --disable-tests
+#ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 ac_add_options --disable-debug
 ac_add_options --enable-optimize
@@ -22,7 +24,9 @@ ac_add_options --enable-pango
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
 ac_add_options --disable-javaxpcom
+ac_add_options --enable-startup-notification
 ac_add_options --disable-crashreporter
+ac_add_options --enable-safe-browsing
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1

xulrunner-redhat-default-prefs.js

@@ -6,3 +6,4 @@ pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "RPM_VERREL");
 pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);

xulrunner-version.patch

@@ -6,7 +6,7 @@ diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="1.9pre"
++MOZ_APP_VERSION="1.9"
 +
  NO_PKG_FILES = \
  	xulrunner-config \

xulrunner.sh.in

@@ -0,0 +1,62 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+## 
+## Usage:
+##
+## $ xulrunner
+##
+## This script is meant to run a xulrunner program from the xulrunner
+## rpm installation.
+##
+
+cmdname=`basename $0`
+
+##
+## Variables
+##
+XUL_ARCH=$(uname -m)
+case $XUL_ARCH in
+	x86_64 | ia64 | s390 )
+		XUL_LIB_DIR="/usr/lib64"
+		SECONDARY_LIB_DIR="/usr/lib"
+		;;
+	* )
+		XUL_LIB_DIR="/usr/lib"
+		SECONDARY_LIB_DIR="/usr/lib64"
+		;;
+esac
+
+if [ ! -x $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then
+    if [ ! -x $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner ]; then
+	echo "Error: $XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found"
+	if [ -d $SECONDARY_LIB_DIR ]; then
+	    echo "       $SECONDARY_LIB_DIR/xulrunner-XULRUNNER_VERSION/xulrunner not found"
+	fi
+	exit 1
+    fi
+    XUL_LIB_DIR="$SECONDARY_LIB_DIR"
+fi
+XUL_DIST_BIN="$XUL_LIB_DIR/xulrunner-XULRUNNER_VERSION"
+XUL_PROGRAM="$XUL_DIST_BIN/xulrunner"
+
+exec $XUL_PROGRAM "$@"

xulrunner.spec

@@ -1,58 +1,38 @@
-%define nspr_version 4.6.99
-%define nss_version 3.11.99.5
+%define nspr_version 4.7.1
+%define nss_version 3.12.1.1
 %define cairo_version 0.5
 
-%define official_branding 0
-
-%define version_internal  1.9pre
-
-%if ! %{official_branding}
-%define cvsdate 20080327
-%define nightly .cvs%{cvsdate}
-%endif
+%define version_internal  1.9
+%define mozappdir         %{_libdir}/%{name}-%{version_internal}
 
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
-Version:        1.9
-Release:        0.50%{?nightly}%{?dist}
-URL:            http://www.mozilla.org/projects/xulrunner/
+Version:        1.9.0.11
+Release:        1%{?dist}
+URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-%if %{official_branding}
-%define tarball xulrunner-%{version}-source.tar.bz2
-%else
-%define tarball mozilla-%{cvsdate}.tar.bz2
-%endif
-Source0:        %{tarball}
+Source0:        xulrunner-%{version}-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
-#Source21:       %{name}.sh.in
+Source21:       %{name}.sh.in
 Source23:       %{name}.1
-Source100:      find-external-requires
 
 # build patches
-Patch4:         mozilla-build.patch
-Patch5:         xulrunner-path.patch
-Patch6:         xulrunner-version.patch
+Patch1:         mozilla-build.patch
+Patch2:         xulrunner-path.patch
+Patch3:         xulrunner-version.patch
+Patch4:         mozilla-sqlite.patch
+Patch5:         mozilla-mochitest.patch
+Patch6:         mozilla-about-firefox-version.patch
 
-# customization patches
+# Fedora specific patches
+Patch10:        mozilla-pkgconfig.patch
 
-# local bugfixes
+# Upstream patches
+Patch26:        mozilla-ps-pdf-simplify-operators.patch
+Patch27:        mozilla-ssl-exception.patch
 
-# font system fixes
-
-# Other
-Patch107:       mozilla-pkgconfig.patch
-
-%if %{official_branding}
-# Required by Mozilla Corporation
-
-
-%else
-# Not yet approved by Mozillla Corporation
-
-
-%endif
 
 # ---------------------------------------------------
 
@@ -75,24 +55,24 @@ BuildRequires:  pango-devel
 BuildRequires:  freetype-devel >= 2.1.9
 BuildRequires:  libXt-devel
 BuildRequires:  libXrender-devel
-BuildRequires:  curl-devel
 BuildRequires:  hunspell-devel
 BuildRequires:  sqlite-devel >= 3.5
+BuildRequires:  startup-notification-devel
+# For -sqlite.patch
+BuildRequires:  autoconf213
 
+Requires:       mozilla-filesystem
 Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
 Provides:       gecko-libs = %{version}
 
-#define _use_internal_dependency_generator 0
-#define __find_requires %{SOURCE100}
-
 %description
 XULRunner provides the XUL Runtime environment for Gecko applications.
 
 %package devel
 Summary: Development files for Gecko
 Group: Development/Libraries
-Obsoletes: mozilla-devel
+Obsoletes: mozilla-devel < 1.9
 Obsoletes: firefox-devel < 2.1
 Requires: xulrunner = %{version}-%{release}
 Requires: nspr-devel >= %{nspr_version}
@@ -117,30 +97,21 @@ are not frozen and APIs can change at any time, so should not be relied on.
 %prep
 %setup -q -c
 cd mozilla
-%patch4   -p1
-%patch5   -p1
-%patch6   -p1 -b .ver
+%patch1  -p1 -b .build
+%patch2  -p1 -b .path
+%patch3  -p1 -b .version
+%patch4  -p1 -b .sqlite
+autoconf-2.13
+%patch5  -p1 -b .mochitest
+%patch6  -p1 -b .about-firefox-version
 
-%patch107 -p1 -b .pk
+%patch10 -p1 -b .pk
 
-
-# For branding specific patches.
-
-%if %{official_branding}
-# Required by Mozilla Corporation
-
-
-%else
-# Not yet approved by Mozilla Corporation
-
-
-%endif
+%patch26 -p1 -b .ps-pdf-simplify-operators
+#%patch27 -p1 -b .ssl-exception
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
-%if %{official_branding}
-%{__cat} %{SOURCE11} >> .mozconfig
-%endif
 
 #---------------------------------------------------------------------
 
@@ -188,10 +159,6 @@ DESTDIR=$RPM_BUILD_ROOT make install
 %{__mkdir_p} $RPM_BUILD_ROOT/${MOZ_APP_DIR} \
              $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME} \
              $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p -d dist/sdk/include $RPM_BUILD_ROOT%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p -d dist/sdk/idl $RPM_BUILD_ROOT%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
-#%{__install} -p dist/sdk/bin/* $RPM_BUILD_ROOT/$MOZ_APP_DIR
-#%{__install} -p dist/sdk/lib/* $RPM_BUILD_ROOT/$MOZ_APP_SDK_DIR
 %{__install} -p dist/sdk/bin/regxpcom $RPM_BUILD_ROOT/$MOZ_APP_DIR
 
 %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications}
@@ -201,7 +168,11 @@ DESTDIR=$RPM_BUILD_ROOT make install
 %{__install} -p -D -m 644 rh-default-prefs $RPM_BUILD_ROOT/${MOZ_APP_DIR}/defaults/pref/all-redhat.js
 %{__rm} rh-default-prefs
 
-%{__install} -p -D -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
+# Start script install
+%{__rm} -rf $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__cat} %{SOURCE21} | %{__sed} -e 's,XULRUNNER_VERSION,%{version_internal},g' > \
+  $RPM_BUILD_ROOT%{_bindir}/%{name}
+%{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %{__rm} -f $RPM_BUILD_ROOT${MOZ_APP_DIR}/%{name}-config
 
@@ -209,23 +180,6 @@ cd $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome
 find . -name "*" -type d -maxdepth 1 -exec %{__rm} -rf {} \;
 cd -
 
-%if %{official_branding}
-%{__mkdir_p} $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT${MOZ_APP_DIR}/chrome/icons/default/ 
-%{__cp} other-licenses/branding/%{name}/default.xpm \
-        $RPM_BUILD_ROOT${MOZ_APP_DIR}/icons/
-%endif
-
-
-# system extensions and plugins support
-%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mozilla/extensions
-%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.mozilla/plugins
-
-
 # Prepare our devel package
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
@@ -233,14 +187,44 @@ cd -
 
 %{__cp} -rL dist/include/* \
   $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__cp} -rL dist/idl/* \
-#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
-#%{__mv} $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_NAME}/* \
-#  $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
-#%{__mv} $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_NAME}/* \
-#  $RPM_BUILD_ROOT/%{_datadir}/idl/${INTERNAL_APP_SDK_NAME}
 
-install -c -m 755 dist/bin/xpcshell \
+# Fix multilib devel conflicts...
+%ifarch x86_64 ia64 s390x ppc64 sparc64
+%define mozbits 64
+%else
+%define mozbits 32
+%endif
+
+function install_file() {
+genheader=$*
+mv ${genheader}.h ${genheader}%{mozbits}.h
+cat > ${genheader}.h << EOF
+// This file exists to fix multilib conflicts
+#if defined(__x86_64__) || defined(__ia64__) || defined(__s390x__) || defined(__powerpc64__) ||defined(__sparc__) && defined(__arch64__)
+#include "${genheader}64.h"
+#else
+#include "${genheader}32.h"
+#endif
+EOF
+}
+
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}
+install_file "mozilla-config"
+popd
+
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
+install_file "mozilla-config"
+popd
+
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/js
+install_file "jsautocfg"
+popd
+
+pushd $RPM_BUILD_ROOT/%{_includedir}/${INTERNAL_APP_SDK_NAME}/unstable
+install_file "jsautocfg"
+popd
+
+%{__install} -p -c -m 755 dist/bin/xpcshell \
   dist/bin/xpidl \
   dist/bin/xpt_dump \
   dist/bin/xpt_link \
@@ -263,6 +247,9 @@ ln -s  %{_includedir}/${INTERNAL_APP_SDK_NAME}/stable \
 ln -s  %{_datadir}/idl/${INTERNAL_APP_SDK_NAME}/stable \
        $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/idl
 
+find $RPM_BUILD_ROOT/%{_includedir} -type f -name "*.h" | xargs chmod 644
+find $RPM_BUILD_ROOT/%{_datadir}/idl -type f -name "*.idl" | xargs chmod 644
+
 %{__rm} -rf $RPM_BUILD_ROOT${MOZ_APP_SDK_DIR}/sdk/lib/*.so
 pushd $RPM_BUILD_ROOT${MOZ_APP_DIR}
 for i in *.so; do
@@ -271,7 +258,7 @@ done
 popd
 
 # GRE stuff
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define gre_conf_file gre64.conf
 %else
 %define gre_conf_file gre.conf
@@ -283,7 +270,7 @@ MOZILLA_GECKO_VERSION=`./config/milestone.pl --topsrcdir=.`
 chmod 644 $RPM_BUILD_ROOT/etc/gre.d/%{gre_conf_file}
 
 # Library path
-%ifarch x86_64 ia64 ppc64 s390x
+%ifarch x86_64 ia64 ppc64 s390x sparc64
 %define ld_conf_file xulrunner-64.conf
 %else
 %define ld_conf_file xulrunner-32.conf
@@ -295,7 +282,7 @@ ${MOZ_APP_DIR}
 EOF
                         
 # Copy over the LICENSE
-install -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
+%{__install} -p -c -m 644 LICENSE $RPM_BUILD_ROOT${MOZ_APP_DIR}
 
 # Use the system hunspell dictionaries
 %{__rm} -rf ${RPM_BUILD_ROOT}${MOZ_APP_DIR}/dictionaries
@@ -328,56 +315,52 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_bindir}/xulrunner
-%{_mandir}/man1/*
-%{_libdir}/mozilla
-%{_datadir}/mozilla
 %dir /etc/gre.d
 /etc/gre.d/%{gre_conf_file}
-%dir %{_libdir}/%{name}-*
-%exclude %dir %{_libdir}/%{name}-sdk-*
-%{_libdir}/%{name}-*/LICENSE
-%{_libdir}/%{name}-*/README.txt
-%{_libdir}/%{name}-*/chrome
-%{_libdir}/%{name}-*/dictionaries
-%dir %{_libdir}/%{name}-*/components
-%ghost %{_libdir}/%{name}-*/components/compreg.dat
-%ghost %{_libdir}/%{name}-*/components/xpti.dat
-%{_libdir}/%{name}-*/components/*
-%{_libdir}/%{name}-*/defaults
-%{_libdir}/%{name}-*/greprefs
-%{_libdir}/%{name}-*/icons
-%{_libdir}/%{name}-*/modules
-%{_libdir}/%{name}-*/plugins
-%{_libdir}/%{name}-*/res
-%{_libdir}/%{name}-*/*.so
-%{_libdir}/%{name}-*/mozilla-xremote-client
-%{_libdir}/%{name}-*/run-mozilla.sh
-%{_libdir}/%{name}-*/regxpcom
-%{_libdir}/%{name}-*/xulrunner
-%{_libdir}/%{name}-*/xulrunner-bin
-%{_libdir}/%{name}-*/xulrunner-stub
-%{_libdir}/%{name}-*/platform.ini
-%{_libdir}/%{name}-*/dependentlibs.list
+%dir %{mozappdir}
+%doc %attr(644, root, root) %{mozappdir}/LICENSE
+%doc %attr(644, root, root) %{mozappdir}/README.txt
+%{mozappdir}/chrome
+%{mozappdir}/dictionaries
+%dir %{mozappdir}/components
+%ghost %{mozappdir}/components/compreg.dat
+%ghost %{mozappdir}/components/xpti.dat
+%{mozappdir}/components/*.so
+%{mozappdir}/components/*.xpt
+%attr(644, root, root) %{mozappdir}/components/*.js
+%{mozappdir}/defaults
+%{mozappdir}/greprefs
+%dir %{mozappdir}/icons
+%attr(644, root, root) %{mozappdir}/icons/*
+%{mozappdir}/modules
+%{mozappdir}/plugins
+%{mozappdir}/res
+%{mozappdir}/*.so
+%{mozappdir}/mozilla-xremote-client
+%{mozappdir}/run-mozilla.sh
+%{mozappdir}/regxpcom
+%{mozappdir}/xulrunner
+%{mozappdir}/xulrunner-bin
+%{mozappdir}/xulrunner-stub
+%{mozappdir}/platform.ini
+%{mozappdir}/dependentlibs.list
 %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf
-%{_sysconfdir}/skel/.mozilla
-
 
 # XXX See if these are needed still
-%{_libdir}/%{name}-*/updater*
+%{mozappdir}/updater*
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_datadir}/idl/%{name}*%{version_internal}
 %{_datadir}/idl/%{name}*%{version_internal}/stable
 %{_includedir}/%{name}*%{version_internal}
 %exclude %{_includedir}/%{name}*%{version_internal}/unstable
-%dir %{_libdir}/%{name}-*
 %dir %{_libdir}/%{name}-sdk-*
 %dir %{_libdir}/%{name}-sdk-*/sdk
-%{_libdir}/%{name}-*/xpcshell
-%{_libdir}/%{name}-*/xpidl
-%{_libdir}/%{name}-*/xpt_dump
-%{_libdir}/%{name}-*/xpt_link
+%{mozappdir}/xpcshell
+%{mozappdir}/xpidl
+%{mozappdir}/xpt_dump
+%{mozappdir}/xpt_link
 %{_libdir}/%{name}-sdk-*/*.h
 %{_libdir}/%{name}-sdk-*/sdk/*
 %exclude %{_libdir}/pkgconfig/*unstable*.pc
@@ -385,7 +368,7 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %files devel-unstable
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_datadir}/idl/%{name}*%{version_internal}/unstable
 %{_includedir}/%{name}*%{version_internal}/unstable
 %dir %{_libdir}/%{name}-sdk-*
@@ -398,6 +381,91 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jun 11 2009 Christopher Aillon <caillon@redhat.com> - 1.9.0.11-1
+- Update to 1.9.0.11
+
+* Mon Apr 27 2009 Jan Horak <jhorak@redhat.com> - 1.9.0.10-1
+- Update to 1.9.0.10
+
+* Tue Apr 21 2009 Christopher Aillon <caillon@redhat.com> - 1.9.0.9-1
+- Update to 1.9.0.9
+
+* Fri Mar 27 2009 Christopher Aillon <caillon@redhat.com> - 1.9.0.8-1
+- Update to 1.9.0.8
+
+* Tue Mar  3 2009 Jan Horak <jhorak@redhat.com> - 1.9.0.7-1
+- Update to 1.9.0.7
+
+* Thu Feb 26 2009 Jan Horak <jhorak@redhat.com> - 1.9.0.6-2
+- Fixed wrong version of Firefox when loading 'about:' as location 
+  (#453980).
+
+* Wed Feb  4 2009 Christopher Aillon <caillon@redhat.com> 1.9.0.6-1
+- Update to 1.9.0.6
+
+* Tue Dec 16 2008 Christopher Aillon <caillon@redhat.com> 1.9.0.5-1
+- Update to 1.9.0.5
+
+* Wed Nov 12 2008 Christopher Aillon <caillon@redhat.com> 1.9.0.4-1
+- Update to 1.9.0.4
+
+* Tue Sep 23 2008 Christopher Aillon <caillon@redhat.com> 1.9.0.2-1
+- Update to 1.9.0.2
+
+* Wed Jul 16 2008 Christopher Aillon <caillon@redhat.com> 1.9.0.1-1
+- Update to 1.9.0.1
+
+* Mon Jun 30 2008 Dennis Gilmore <dennis@ausil.us> 1.9-1.1
+- handle sparc arches
+
+* Tue Jun 17 2008 Christopher Aillon <caillon@redhat.com> 1.9-1
+- Update to 1.9 final
+
+* Thu May 29 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.63
+- Simplify PS/PDF operators
+
+* Thu May 22 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.62
+- Upstream patch to fsync() less
+
+* Thu May 08 2008 Colin Walters <walters@redhat.com> 1.9-0.61
+- Ensure we enable startup notification; add BR and modify config
+  (bug #445543)
+
+* Wed Apr 30 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.60
+- Some files moved to mozilla-filesystem; kill them and add the Req
+
+* Mon Apr 28 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.59
+- Clean up the %%files list and get rid of the executable bit on some files
+
+* Sat Apr 26 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.58
+- Fix font scaling
+
+* Fri Apr 25 2008 Martin Stransky <stransky@redhat.com> 1.9-0.57
+- Enabled phishing protection (#443403)
+
+* Wed Apr 23 2008 Martin Stransky <stransky@redhat.com> 1.9-0.56
+- Changed "__ppc64__" to "__powerpc64__", 
+  "__ppc64__" doesn't work anymore
+- Added fix for #443725 - Critical hanging bug with fix 
+  available upstream (mozbz#429903)
+
+* Fri Apr 18 2008 Martin Stransky <stransky@redhat.com> 1.9-0.55
+- Fixed multilib issues, added starting script instead of a symlink
+  to binary (#436393)
+
+* Sat Apr 12 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.54
+- Add upstream patches for dpi, toolbar buttons, and invalid keys
+- Re-enable system cairo
+
+* Mon Apr  7 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.53
+- Spec cleanups
+
+* Wed Apr  2 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.52
+- Beta 5
+
+* Mon Mar 31 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.51
+- Beta 5 RC2
+
 * Thu Mar 27 2008 Christopher Aillon <caillon@redhat.com> 1.9-0.50
 - Update to latest trunk (2008-03-27)