diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rwxr-xr-x | firefox-1.1-default-applications.patch | 32 | ||||
| -rw-r--r-- | firefox-1.1-nss-system-nspr.patch | 124 | ||||
| -rwxr-xr-x | firefox-1.1-ppc64.patch | 26 | ||||
| -rwxr-xr-x | firefox-1.1-software-update.patch | 18 | ||||
| -rwxr-xr-x | firefox-1.1-uriloader.patch | 437 | ||||
| -rwxr-xr-x | firefox-mozconfig | 22 | ||||
| -rwxr-xr-x | firefox-mozconfig-branded | 1 | ||||
| -rw-r--r-- | firefox-redhat-default-prefs.js | 3 | ||||
| -rw-r--r-- | firefox-redhat-homepage.patch | 26 | ||||
| -rw-r--r-- | firefox.spec | 200 | ||||
| -rw-r--r-- | sources | 2 |
12 files changed, 739 insertions, 153 deletions
@@ -10,3 +10,4 @@ firefox-1.0.2-source.tar.bz2 firefox-1.0.3-source.tar.bz2 firefox-1.0-locales.tar.bz2 deerpark-alpha1-source.tar.bz2 +firefox-1.1a2-source.tar.bz2 diff --git a/firefox-1.1-default-applications.patch b/firefox-1.1-default-applications.patch new file mode 100755 index 0000000..3936926 --- /dev/null +++ b/firefox-1.1-default-applications.patch @@ -0,0 +1,32 @@ +Index: browser/components/shell/src/nsGNOMEShellService.h +=================================================================== +RCS file: /cvsroot/mozilla/browser/components/shell/src/nsGNOMEShellService.h,v +retrieving revision 1.2.4.1 +diff -d -u -p -r1.2.4.1 nsGNOMEShellService.h +--- browser/components/shell/src/nsGNOMEShellService.h 15 Jul 2004 20:43:55 -0000 1.2.4.1 ++++ browser/components/shell/src/nsGNOMEShellService.h 15 Oct 2004 20:39:56 -0000 +@@ -43,7 +43,7 @@ + class nsGNOMEShellService : public nsIShellService + { + public: +- nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) { } ++ nsGNOMEShellService() : mCheckedThisSession(PR_TRUE) { } + + NS_DECL_ISUPPORTS + NS_DECL_NSISHELLSERVICE +Index: browser/components/preferences/general.xul +=================================================================== +RCS file: /cvsroot/mozilla/browser/components/preferences/general.xul,v +retrieving revision 1.5 +diff -d -u -p -r1.5 general.xul +--- browser/components/preferences/general.xul 10 Mar 2005 18:43:57 -0000 1.5 ++++ browser/components/preferences/general.xul 17 Jun 2005 14:25:12 -0000 +@@ -62,7 +62,7 @@ + </hbox> + </groupbox> + +-#ifdef HAVE_SHELL_SERVICE ++#if 0 + <groupbox orient="horizontal"> + <caption label="&defaultBrowserGroup.label;"/> + <hbox align="center" flex="1"> diff --git a/firefox-1.1-nss-system-nspr.patch b/firefox-1.1-nss-system-nspr.patch new file mode 100644 index 0000000..f92abe7 --- /dev/null +++ b/firefox-1.1-nss-system-nspr.patch @@ -0,0 +1,124 @@ +Index: mozilla/security/coreconf/location.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v +retrieving revision 1.9 +diff -u -r1.9 location.mk +--- mozilla/security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9 ++++ mozilla/security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000 +@@ -61,6 +61,8 @@ + + DIST = $(SOURCE_PREFIX)/$(PLATFORM) + ++NSPR_LIBDIR = $(DIST)/lib ++ + ifdef BUILD_DEBUG_GC + DEFINES += -DDEBUG_GC + endif +Index: mozilla/security/manager/Makefile.in +=================================================================== +RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v +retrieving revision 1.56 +diff -u -r1.56 Makefile.in +--- mozilla/security/manager/Makefile.in 14 Mar 2005 10:00:58 -0000 1.56 ++++ mozilla/security/manager/Makefile.in 11 Apr 2005 20:21:57 -0000 +@@ -76,12 +76,23 @@ + endif + endif + ++ABS_DIST := $(shell cd $(DIST) && pwd) ++ifeq ($(OS_ARCH),WINNT) ++ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g') ++endif ++NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS))) ++ifneq (,$(strip $(NSPR_LIBDIR))) ++NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR))) ++else ++NSPR_LIBDIR = $(ABS_DIST)/lib ++endif + # NSS makefiles are not safe for parallel execution. + DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1 + DEFAULT_GMAKE_FLAGS += CC="$(CC)" +-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm" +-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist +-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist ++DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)" ++DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST) ++DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST) ++DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR) + DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 + DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 + ABS_topsrcdir := $(shell cd $(topsrcdir); pwd) +Index: mozilla/security/nss/lib/ckfw/builtins/Makefile +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v +retrieving revision 1.14 +diff -u -r1.14 Makefile +--- mozilla/security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14 ++++ mozilla/security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000 +@@ -53,23 +53,23 @@ + # This is merely an expedient hack and not the right solution. + ifdef NS_USE_GCC + EXTRA_LIBS += \ +- -L$(DIST)/lib \ ++ -L$(NSPR_LIBDIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ + $(NULL) + else + EXTRA_LIBS += \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + $(NULL) + endif + + else + + EXTRA_LIBS += \ +- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NULL) + + endif +Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +=================================================================== +RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v +retrieving revision 1.18 +diff -u -r1.18 Makefile +--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18 ++++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000 +@@ -63,7 +63,7 @@ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ + $(CRYPTO_LIB) \ + $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ +- -L$(DIST)/lib \ ++ -L$(NSPR_LIBDIR) \ + -lplc4 \ + -lplds4 \ + -lnspr4 \ +@@ -76,8 +76,8 @@ + $(DIST)/lib/softokn.lib \ + $(CRYPTO_LIB) \ + $(DIST)/lib/secutil.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ +- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \ ++ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + wsock32.lib \ + winmm.lib \ + $(NULL) +@@ -98,8 +98,8 @@ + $(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \ + $(CRYPTO_LIB) \ + $(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \ ++ $(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \ + $(NULL) + + endif diff --git a/firefox-1.1-ppc64.patch b/firefox-1.1-ppc64.patch new file mode 100755 index 0000000..2e7b014 --- /dev/null +++ b/firefox-1.1-ppc64.patch @@ -0,0 +1,26 @@ +Index: security/coreconf/Linux.mk +=================================================================== +RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v +retrieving revision 1.18 +diff -d -u -p -r1.18 Linux.mk +--- security/coreconf/Linux.mk 1 Feb 2005 23:39:18 -0000 1.18 ++++ security/coreconf/Linux.mk 20 Jun 2005 07:32:29 -0000 +@@ -56,6 +56,10 @@ ifeq ($(OS_TEST),m68k) + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = m68k + else ++ifeq ($(OS_TEST),ppc64) ++ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++ CPU_ARCH = ppc64 ++else + ifeq ($(OS_TEST),ppc) + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = ppc +@@ -119,6 +123,7 @@ endif + endif + endif + endif ++endif + + + LIBC_TAG = _glibc diff --git a/firefox-1.1-software-update.patch b/firefox-1.1-software-update.patch new file mode 100755 index 0000000..a94226e --- /dev/null +++ b/firefox-1.1-software-update.patch @@ -0,0 +1,18 @@ +? browser/components/preferences/~advanced.xul +Index: browser/components/preferences/advanced.xul +=================================================================== +RCS file: /cvsroot/mozilla/browser/components/preferences/advanced.xul,v +retrieving revision 1.3 +diff -d -u -p -r1.3 advanced.xul +--- browser/components/preferences/advanced.xul 10 Mar 2005 18:43:57 -0000 1.3 ++++ browser/components/preferences/advanced.xul 20 Jun 2005 08:09:44 -0000 +@@ -55,9 +55,6 @@ + type="bool"/> + <preference id="general.autoScroll" name="general.autoScroll" type="bool"/> + <preference id="general.smoothScroll" name="general.smoothScroll" type="bool"/> +- <preference id="app.update.autoUpdateEnabled" name="app.update.autoUpdateEnabled" type="bool"/> +- <preference id="app.update.autoInstallEnabled" name="app.update.autoInstallEnabled" type="bool"/> +- <preference id="app.update.autoInstallMode" name="app.update.autoInstallMode" type="int"/> + <preference id="extensions.update.autoUpdateEnabled" + name="extensions.update.autoUpdateEnabled" + type="bool"/> diff --git a/firefox-1.1-uriloader.patch b/firefox-1.1-uriloader.patch new file mode 100755 index 0000000..2f83ecf --- /dev/null +++ b/firefox-1.1-uriloader.patch @@ -0,0 +1,437 @@ +Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp +=================================================================== +RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v +retrieving revision 1.10 +diff -d -u -p -r1.10 nsGNOMERegistry.cpp +--- uriloader/exthandler/unix/nsGNOMERegistry.cpp 16 Oct 2004 13:46:17 -0000 1.10 ++++ uriloader/exthandler/unix/nsGNOMERegistry.cpp 20 Jun 2005 09:48:02 -0000 +@@ -42,7 +42,7 @@ + #include "nsString.h" + #include "nsIComponentManager.h" + #include "nsILocalFile.h" +-#include "nsMIMEInfoImpl.h" ++#include "nsMIMEInfoUnix.h" + #include "nsAutoPtr.h" + + #include <glib.h> +@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient; + typedef struct _GnomeProgram GnomeProgram; + typedef struct _GnomeModuleInfo GnomeModuleInfo; + +-typedef struct { ++struct GnomeVFSMimeApplication { + char *id; + char *name; + char *command; + /* there is more here, but we don't need it */ +-} GnomeVFSMimeApplication; ++}; + + typedef GConfClient * (*_gconf_client_get_default_fn)(); + typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *, +@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con + } + + +-/* static */ already_AddRefed<nsMIMEInfoBase> ++/* static */ already_AddRefed<nsMIMEInfoUnix> + nsGNOMERegistry::GetFromExtension(const char *aFileExt) + { + if (!gconfLib) +@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const + return GetFromType(mimeType); + } + +-/* static */ already_AddRefed<nsMIMEInfoBase> ++/* static */ already_AddRefed<nsMIMEInfoUnix> + nsGNOMERegistry::GetFromType(const char *aMIMEType) + { + if (!gconfLib) +@@ -296,7 +296,7 @@ nsGNOMERegistry::GetFromType(const char + if (!handlerApp) + return nsnull; + +- nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType); ++ nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType); + NS_ENSURE_TRUE(mimeInfo, nsnull); + + // Get the list of extensions and append then to the mimeInfo. +@@ -320,11 +320,21 @@ nsGNOMERegistry::GetFromType(const char + return nsnull; + } + +- gchar *commandPath = g_find_program_in_path(nativeCommand); ++ gchar **argv; ++ gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL); ++ if (!res) { ++ NS_ERROR("Could not convert helper app command to filesystem encoding"); ++ _gnome_vfs_mime_application_free(handlerApp); ++ return nsnull; ++ } ++ ++ gchar *commandPath = g_find_program_in_path(argv[0]); + + g_free(nativeCommand); ++ g_strfreev(argv); + + if (!commandPath) { ++ NS_WARNING("could not find command in path"); + _gnome_vfs_mime_application_free(handlerApp); + return nsnull; + } +@@ -342,7 +352,7 @@ nsGNOMERegistry::GetFromType(const char + + _gnome_vfs_mime_application_free(handlerApp); + +- nsMIMEInfoBase* retval; ++ nsMIMEInfoUnix* retval; + NS_ADDREF((retval = mimeInfo)); + return retval; + } +Index: uriloader/exthandler/unix/nsGNOMERegistry.h +=================================================================== +RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v +retrieving revision 1.3 +diff -d -u -p -r1.3 nsGNOMERegistry.h +--- uriloader/exthandler/unix/nsGNOMERegistry.h 16 Oct 2004 13:46:17 -0000 1.3 ++++ uriloader/exthandler/unix/nsGNOMERegistry.h 20 Jun 2005 09:48:02 -0000 +@@ -35,10 +35,13 @@ + * + * ***** END LICENSE BLOCK ***** */ + ++#ifndef nsGNOMERegistry_h__ ++#define nsGNOMERegistry_h__ ++ + #include "nsIURI.h" + #include "nsCOMPtr.h" + +-class nsMIMEInfoBase; ++class nsMIMEInfoUnix; + + class nsGNOMERegistry + { +@@ -52,7 +55,9 @@ class nsGNOMERegistry + static void GetAppDescForScheme(const nsACString& aScheme, + nsAString& aDesc); + +- static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt); ++ static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt); + +- static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType); ++ static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType); + }; ++ ++#endif // nsGNOMERegistry_h__ +Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +=================================================================== +RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 20 Jun 2005 09:48:02 -0000 +@@ -0,0 +1,196 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla 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/MPL/ ++ * ++ * 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 ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon <caillon@redhat.com> (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#include "nsMIMEInfoUnix.h" ++#include "prlink.h" ++#include "prmem.h" ++#include <glib.h> ++#include <glib-object.h> ++ ++static PRLibrary *gnomeLib; ++static PRLibrary *vfsLib; ++ ++typedef struct _GnomeProgram GnomeProgram; ++typedef struct _GnomeModuleInfo GnomeModuleInfo; ++ ++typedef enum { ++ GNOME_VFS_OK // there's more but we don't care about them. ++} GnomeVFSResult; ++ ++typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn) ++ (GnomeVFSMimeApplication *app, ++ GList *uris); ++typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *); ++typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *); ++typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *, ++ const GnomeModuleInfo *, int, ++ char **, const char *, ...); ++typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *); ++typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)(); ++typedef GnomeProgram * (*_gnome_program_get_fn)(); ++typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *); ++ ++#define DECL_FUNC_PTR(func) static _##func##_fn _##func ++ ++DECL_FUNC_PTR(gnome_vfs_mime_application_launch); ++DECL_FUNC_PTR(gnome_vfs_mime_application_free); ++DECL_FUNC_PTR(gnome_vfs_mime_application_copy); ++DECL_FUNC_PTR(gnome_vfs_mime_application_get_name); ++DECL_FUNC_PTR(gnome_program_init); ++DECL_FUNC_PTR(gnome_program_get); ++DECL_FUNC_PTR(libgnome_module_info_get); ++DECL_FUNC_PTR(gnome_vfs_make_uri_from_input); ++ ++static PRLibrary * ++LoadVersionedLibrary(const char* libName, const char* libVersion) ++{ ++ char *platformLibName = PR_GetLibraryName(nsnull, libName); ++ nsCAutoString versionLibName(platformLibName); ++ versionLibName.Append(libVersion); ++ PR_Free(platformLibName); ++ return PR_LoadLibrary(versionLibName.get()); ++} ++ ++static void ++Cleanup() ++{ ++ // Unload all libraries ++ if (gnomeLib) ++ PR_UnloadLibrary(gnomeLib); ++ if (vfsLib) ++ PR_UnloadLibrary(vfsLib); ++ ++ gnomeLib = vfsLib = nsnull; ++} ++ ++static void ++InitGnomeVFS() ++{ ++ static PRBool initialized = PR_FALSE; ++ ++ if (initialized) ++ return; ++ ++ #define ENSURE_LIB(lib) \ ++ PR_BEGIN_MACRO \ ++ if (!lib) { \ ++ Cleanup(); \ ++ return; \ ++ } \ ++ PR_END_MACRO ++ ++ #define GET_LIB_FUNCTION(lib, func, failure) \ ++ PR_BEGIN_MACRO \ ++ _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \ ++ if (!_##func) { \ ++ failure; \ ++ } \ ++ PR_END_MACRO ++ ++ // Attempt to open libgnome ++ gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); ++ ENSURE_LIB(gnomeLib); ++ ++ GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup()); ++ GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup()); ++ ++ // Attempt to open libgnomevfs ++ vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); ++ ENSURE_LIB(vfsLib); ++ ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup()); ++ GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup()); ++ ++ // Initialize GNOME, if it's not already initialized. It's not ++ // necessary to tell GNOME about our actual command line arguments. ++ ++ if (!_gnome_program_get()) { ++ char *argv[1] = { "gecko" }; ++ _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(), ++ 1, argv, NULL); ++ } ++ ++ // Note: after GNOME has been initialized, do not ever unload these ++ // libraries. They register atexit handlers, so if they are unloaded, we'll ++ // crash on exit. ++} ++ ++void ++nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app) ++{ ++ if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) { ++ mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app); ++ ++ mPreferredAction = nsIMIMEInfo::useSystemDefault; ++ ++ const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication); ++ if (name) ++ mDefaultAppDescription = NS_ConvertUTF8toUCS2(name); ++ } ++} ++ ++nsMIMEInfoUnix::~nsMIMEInfoUnix() ++{ ++ if (mDefaultVFSApplication) ++ _gnome_vfs_mime_application_free(mDefaultVFSApplication); ++} ++ ++nsresult ++nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile) ++{ ++ NS_ENSURE_ARG_POINTER(aFile); ++ ++ InitGnomeVFS(); ++ ++ if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) { ++ nsCAutoString nativePath; ++ aFile->GetNativePath(nativePath); ++ ++ gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get()); ++ ++ GList *uris = NULL; ++ uris = g_list_append(uris, uri); ++ ++ GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris); ++ ++ g_free(uri); ++ g_list_free(uris); ++ ++ if (result != GNOME_VFS_OK) ++ return NS_ERROR_FAILURE; ++ ++ return NS_OK; ++ } ++ ++ if (!mDefaultApplication) ++ return NS_ERROR_FILE_NOT_FOUND; ++ ++ return LaunchWithIProcess(mDefaultApplication, aFile); ++} +Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h +=================================================================== +RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h +diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ uriloader/exthandler/unix/nsMIMEInfoUnix.h 20 Jun 2005 09:48:02 -0000 +@@ -0,0 +1,48 @@ ++/* ***** BEGIN LICENSE BLOCK ***** ++ * Version: MPL 1.1 ++ * ++ * The contents of this file are subject to the Mozilla 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/MPL/ ++ * ++ * 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 ++ * Red Hat, Inc. ++ * Portions created by the Initial Developer are Copyright (C) 2005 ++ * the Initial Developer. All Rights Reserved. ++ * ++ * Contributor(s): ++ * Christopher Aillon <caillon@redhat.com> (Original author) ++ * ++ * ++ * ***** END LICENSE BLOCK ***** */ ++ ++#ifndef nsMimeInfoUnix_h__ ++#define nsMimeInfoUnix_h__ ++ ++#include "nsMIMEInfoImpl.h" ++ ++struct GnomeVFSMimeApplication; ++ ++class nsMIMEInfoUnix : public nsMIMEInfoImpl ++{ ++public: ++ nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {} ++ nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {}; ++ ++ void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app); ++ ++protected: ++ virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile); ++ ++ GnomeVFSMimeApplication *mDefaultVFSApplication; ++}; ++ ++#endif // nsMimeInfoUnix_h__ +Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp +=================================================================== +RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v +retrieving revision 1.58 +diff -d -u -p -r1.58 nsOSHelperAppService.cpp +--- uriloader/exthandler/unix/nsOSHelperAppService.cpp 25 Oct 2004 07:46:01 -0000 1.58 ++++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Jun 2005 09:48:02 -0000 +@@ -44,6 +44,7 @@ + #include "nsOSHelperAppService.h" + #ifdef MOZ_WIDGET_GTK2 + #include "nsGNOMERegistry.h" ++#include "nsMIMEInfoUnix.h" + #endif + #include "nsISupports.h" + #include "nsString.h" +@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const + + LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get())); + ++#ifdef MOZ_WIDGET_GTK2 ++ // Look in GNOME registry first since it is the preferred method in GNOME, ++ // should trump the mailcap entry ++ LOG(("Looking in GNOME registry\n")); ++ nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); ++ if (gnomeInfo) { ++ LOG(("Got MIMEInfo from GNOME registry\n")); ++ return gnomeInfo; ++ } ++#endif ++ + // extract the major and minor types + NS_ConvertASCIItoUTF16 mimeType(aMIMEType); + nsAString::const_iterator start_iter, end_iter, +@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const + mozillaFlags, + PR_TRUE); + +- +- if (handler.IsEmpty() && extensions.IsEmpty() && +- mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) { +- // No useful data yet +- +-#ifdef MOZ_WIDGET_GTK2 +- LOG(("Looking in GNOME registry\n")); +- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get(); +- if (gnomeInfo) { +- LOG(("Got MIMEInfo from GNOME registry\n")); +- return gnomeInfo; +- } +-#endif +- } +- + if (handler.IsEmpty() && mailcap_description.IsEmpty()) { + DoLookUpHandlerAndDescription(majorType, + minorType, diff --git a/firefox-mozconfig b/firefox-mozconfig new file mode 100755 index 0000000..2ffecbc --- /dev/null +++ b/firefox-mozconfig @@ -0,0 +1,22 @@ +. $topsrcdir/browser/config/mozconfig + +ac_add_options --with-system-nspr +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-png +ac_add_options --with-pthreads +ac_add_options --disable-tests +ac_add_options --disable-debug +ac_add_options --disable-installer +ac_add_options --enable-optimize="$RPM_OPT_FLAGS" +ac_add_options --enable-xinerama +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --disable-xprint +ac_add_options --disable-strip +ac_add_options --enable-pango + +export BUILD_OFFICIAL=1 +export MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + diff --git a/firefox-mozconfig-branded b/firefox-mozconfig-branded new file mode 100755 index 0000000..53b376d --- /dev/null +++ b/firefox-mozconfig-branded @@ -0,0 +1 @@ +ac_add_options --enable-official-branding diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js index 89b69d1..7cbcefe 100644 --- a/firefox-redhat-default-prefs.js +++ b/firefox-redhat-default-prefs.js @@ -1,5 +1,8 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); pref("browser.display.use_system_colors", true); pref("browser.link.open_external", 2); +pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); pref("general.smoothScroll", true); pref("general.useragent.vendor", "Fedora"); pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); diff --git a/firefox-redhat-homepage.patch b/firefox-redhat-homepage.patch index de7b9fc..ac9819e 100644 --- a/firefox-redhat-homepage.patch +++ b/firefox-redhat-homepage.patch @@ -6,31 +6,11 @@ diff -d -u -p -0 -r1.1.2.3 region.properties --- browser/locales/en-US/chrome/browser-region/region.properties 29 Aug 2004 07:29:59 -0000 1.1.2.3 +++ browser/locales/en-US/chrome/browser-region/region.properties 25 Sep 2004 03:07:18 -0000 @@ -3 +3 @@ general.useragent.contentlocale=US --homePageDefault=http://www.mozilla.org/products/firefox/start/ +-homePageDefault=http://start.mozilla.org/firefox +homePageDefault=file:///usr/share/doc/HTML/index.html @@ -10 +10 @@ promoteURL=http://www.spreadfirefox.com/ --browser.startup.homepage=http://start.mozilla.org/firefox/ +-browser.startup.homepage=http://start.mozilla.org/firefox +browser.startup.homepage=file:///usr/share/doc/HTML/index.html @@ -15 +15 @@ browser.search.defaulturl=http://www.goo --startup.homepage_override_url=http://www.mozilla.org/products/firefox/start/ +-startup.homepage_override_url=http://www.mozilla.org/products/firefox/releases/whatsnew/ +startup.homepage_override_url=file:///usr/share/doc/HTML/index.html -Index: browser/app/profile/firefox.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/app/profile/firefox.js,v -retrieving revision 1.7.4.38 -diff -d -u -p -r1.7.4.38 firefox.js ---- browser/app/profile/firefox.js 26 Oct 2004 22:44:47 -0000 1.7.4.38 -+++ browser/app/profile/firefox.js 31 Oct 2004 08:28:37 -0000 -@@ -141,10 +141,10 @@ pref("browser.shell.checkDefaultBrowser" - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last - // XXXBlake Remove this stupid pref - pref("browser.startup.page", 1); --pref("browser.startup.homepage", "resource:/browserconfig.properties"); -+pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); - - // These values are deliberately non-localizable for official builds. --pref("browser.startup.homepage_reset", "resource:/browserconfig.properties"); -+pref("browser.startup.homepage_reset", "chrome://browser-region/locale/region.properties"); - pref("browser.update.resetHomepage", false); - // "browser.startup.homepage_override" was for 4.x - pref("browser.startup.homepage_override.1", false); diff --git a/firefox.spec b/firefox.spec index 2b26a1d..6ad8153 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,28 +1,32 @@ -# Option: Freetype Patch (FC3+) -%define freetype_fc3 1 - -%define nspr_version 4.6 -%define desktop_file_utils_version 0.9 +# Temporary until this works again +ExcludeArch: ppc64 ppc %define indexhtml file:///usr/share/doc/HTML/index.html +%define desktop_file_utils_version 0.9 +%define nspr_version 4.6 -ExcludeArch: ppc64 +%define official_branding 0 Summary: Mozilla Firefox Web browser. Name: firefox -Version: 1.0.4 -Release: 6 -Epoch: 0 +Version: 1.1 +Release: 0.0.1.deerpark.alpha2 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet -Source0: firefox-%{version}-source.tar.bz2 +%if %{official_branding} +%define tarball firefox-%{version}-source.tar.bz2 +%else +%define tarball firefox-1.1a2-source.tar.bz2 +%endif +Source0: %{tarball} Source1: firefox-gnomestripe-0.1.tar.gz Source2: firefox-1.0-locales.tar.bz2 -Source10: mozconfig-firefox -Source11: firefox-redhat-default-bookmarks.html -Source12: firefox-redhat-default-prefs.js +Source10: firefox-mozconfig +Source11: firefox-mozconfig-branded +Source12: firefox-redhat-default-bookmarks.html +Source13: firefox-redhat-default-prefs.js Source20: firefox.desktop Source21: firefox.sh.in Source22: firefox.png @@ -33,49 +37,34 @@ Source55: firefox-rebuild-databases.pl.in Source100: find-external-requires # build patches -Patch1: firefox-0.7.3-freetype-compile.patch -Patch2: firefox-1.0-prdtoa.patch -Patch3: firefox-1.0-gcc4-compile.patch -Patch4: firefox-1.0-recv-fortify.patch -Patch5: firefox-1.0-gfxshared_s.patch -Patch6: firefox-1.0-nss-system-nspr.patch -Patch7: firefox-1.0-system-nspr-ldap.patch +Patch1: firefox-1.0-prdtoa.patch +Patch2: firefox-1.0-gcc4-compile.patch +Patch3: firefox-1.1-nss-system-nspr.patch +Patch4: firefox-1.1-dont-package-nspr-libs.patch +Patch5: firefox-1.1-visibility.patch # customization patches Patch20: firefox-redhat-homepage.patch Patch21: firefox-0.7.3-default-plugin-less-annoying.patch Patch22: firefox-0.7.3-psfonts.patch -Patch24: firefox-PR1-default-applications.patch -Patch25: firefox-PR1-software-update.patch +Patch24: firefox-1.1-default-applications.patch +Patch25: firefox-1.1-software-update.patch Patch26: firefox-RC1-stock-icons-be.patch Patch27: firefox-RC1-stock-icons-fe.patch Patch28: firefox-RC1-stock-icons-gnomestripe.patch Patch29: firefox-gnomestripe-0.1-livemarks.patch -Patch30: mozilla-1.7.3-pango-render.patch -Patch31: firefox-1.0-pango-selection.patch -Patch32: firefox-1.0-pango-space-width.patch -Patch33: firefox-1.0-pango-rounding.patch -Patch34: firefox-1.0-pango-direction.patch -Patch35: firefox-1.0-pango-bidi-justify.patch -Patch36: firefox-1.0-pango-cairo.patch # local bugfixes Patch41: firefox-PR1-stack-direction.patch -Patch42: firefox-1.0-download-to-desktop.patch -Patch43: firefox-1.0-uriloader.patch -Patch44: firefox-1.0-locales-no-searchplugins.patch - -# backported patches -Patch90: firefox-PR1-gtk-file-chooser-morefixes.patch - -# official upstream patches -Patch101: firefox-PR1-pkgconfig.patch -Patch102: firefox-1.0-useragent.patch -Patch103: firefox-1.0-gtk-system-colors.patch -Patch104: firefox-1.0-remote-intern-atoms.patch -Patch105: firefox-1.0-g-application-name.patch -Patch106: firefox-1.0-candidate-window.patch -Patch107: firefox-1.0-imgloader-comarray.patch +Patch42: firefox-1.1-uriloader.patch + +# font system fixes +Patch80: firefox-1.0-pango-cairo.patch + +# patches from upstream (Patch100+) + + +# --------------------------------------------------- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: nspr-devel >= %{nspr_version} @@ -89,12 +78,7 @@ BuildRequires: libgnome-devel BuildRequires: libgnomeui-devel BuildRequires: krb5-devel BuildRequires: pango-devel -BuildRequires: autoconf213 -%if %{freetype_fc3} BuildRequires: freetype-devel >= 2.1.9 -%else -BuildRequires: freetype-devel -%endif Requires: nspr >= %{nspr_version} Requires: desktop-file-utils >= %{desktop_file_utils_version} @@ -115,72 +99,56 @@ compliance, performance and portability. %prep %setup -q -n mozilla -%{__tar} -xzf %{SOURCE1} -%{__tar} -xjf %{SOURCE2} -%if %{freetype_fc3} -%patch1 -p0 -%endif +#%{__tar} -xzf %{SOURCE1} %patch2 -p0 -%patch3 -p0 +%patch3 -p1 %patch4 -p0 + +# Pragma visibility is broken on most platforms for some reason. +# It works on i386 so leave it alone there. Disable elsewhere. +%ifnarch i386 %patch5 -p0 -%patch6 -p1 -%patch7 -p0 +%endif + %patch20 -p0 %patch21 -p1 %patch22 -p1 %patch24 -p0 -%patch25 -p0 -%patch26 -p0 -%patch27 -p0 -%patch28 -p0 -%patch29 -p1 -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 -%patch35 -p0 -%patch36 -p1 +#%patch25 -p0 +#%patch26 -p0 +#%patch27 -p0 +#%patch28 -p0 +#%patch29 -p1 %patch41 -p0 %patch42 -p0 -%patch43 -p0 -%patch44 -p0 -%patch90 -p0 -%patch101 -p0 -%patch102 -p0 -%patch103 -p0 -%patch104 -p0 -%patch105 -p0 -%patch106 -p1 -%patch107 -p0 +%patch80 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig +%if %{official_branding} +%{__cat} %{SOURCE11} >> .mozconfig +%endif # set up our default bookmarks -%{__cp} %{SOURCE11} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html +%{__cp} %{SOURCE12} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html #--------------------------------------------------------------------- %build -autoconf-2.13 -export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed s/-O2/-Os/` -export MOZILLA_OFFICIAL=1 -export BUILD_OFFICIAL=1 +export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/` MAKE="gmake %{?_smp_mflags}" make -f client.mk build for locale in `cat browser/locales/all-locales` do if [ -d browser/locales/$locale ] ; then - perl -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \ + %{__perl} -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \ browser/locales/$locale/chrome/browser-region/region.properties - make -C browser/locales AB_CD=$locale + %{__make} -C browser/locales AB_CD=$locale fi if [ -d toolkit/locales/$locale ] ; then - make -C toolkit/locales AB_CD=$locale + %{__make} -C toolkit/locales AB_CD=$locale fi done @@ -189,16 +157,16 @@ done %install %{__rm} -rf $RPM_BUILD_ROOT -cd xpinstall/packager/ -%{__make} MOZILLA_BIN="\$(DIST)/bin/firefox-bin" STRIP=/bin/true +cd browser/installer +%{__make} STRIP=/bin/true cd - %{__mkdir_p} $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_datadir}/applications} -%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/firefox-*-linux-gnu.tar.gz +%{__tar} -C $RPM_BUILD_ROOT%{_libdir}/ -xzf dist/firefox-*linux*.tar.gz %{__mv} $RPM_BUILD_ROOT%{_libdir}/firefox $RPM_BUILD_ROOT%{ffdir} -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/firefox-*-linux-gnu.tar +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/firefox-*-linux-gnu*.tar %{__install} -p -D %{SOURCE22} $RPM_BUILD_ROOT%{_datadir}/pixmaps/firefox.png @@ -215,14 +183,13 @@ desktop-file-install --vendor mozilla \ %{__chmod} 755 $RPM_BUILD_ROOT%{_bindir}/firefox # set up our default preferences -%{__cat} %{SOURCE12} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs +%{__cat} %{SOURCE13} | %{__sed} -e 's,FIREFOX_RPM_VR,%{version}-%{release},g' > rh-default-prefs %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{ffdir}/greprefs/all-redhat.js %{__cp} rh-default-prefs $RPM_BUILD_ROOT/%{ffdir}/defaults/pref/all-redhat.js %{__rm} rh-default-prefs # set up our default bookmarks -%{__install} -p -D %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/US/bookmarks.html -%{__install} -p -D %{SOURCE11} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html +%{__install} -p -D %{SOURCE12} $RPM_BUILD_ROOT%{ffdir}/defaults/profile/bookmarks.html %{__cat} %{SOURCE50} | %{__sed} -e 's,FFDIR,%{ffdir},g' -e 's,LIBDIR,%{_libdir},g' > \ $RPM_BUILD_ROOT%{ffdir}/firefox-xremote-client @@ -242,9 +209,8 @@ cd - %{__cat} > $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); EOF -chmod 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js +%{__chmod} 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js -# another bug fixed by looking at the debian package %{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/ %{__cp} %{SOURCE23} $RPM_BUILD_ROOT%{ffdir}/chrome/icons/default/default.xpm %{__cp} %{SOURCE23} $RPM_BUILD_ROOT%{ffdir}/icons/default.xpm @@ -253,20 +219,8 @@ chmod 644 $RPM_BUILD_ROOT%{ffdir}/defaults/pref/firefox-l10n.js %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins # ghost files -touch $RPM_BUILD_ROOT%{ffdir}/chrome/chrome.rdf -for overlay in {"browser","communicator","inspector","messenger","navigator"}; do - %{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/chrome/overlayinfo/$overlay/content - touch $RPM_BUILD_ROOT%{ffdir}/chrome/overlayinfo/$overlay/content/overlays.rdf -done -touch $RPM_BUILD_ROOT%{ffdir}/components.ini touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat -%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -touch $RPM_BUILD_ROOT%{ffdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -touch $RPM_BUILD_ROOT%{ffdir}/extensions/installed-extensions-processed.txt -touch $RPM_BUILD_ROOT%{ffdir}/extensions/Extensions.rdf - - #--------------------------------------------------------------------- @@ -281,12 +235,6 @@ update-desktop-database %{_datadir}/applications umask 022 %{ffdir}/firefox-rebuild-databases.pl || : -# create list of installed chrome -# munge HOME for now, since XPCOM creates $HOME/.mozilla -MOZTMP=`mktemp -d` -HOME=$MOZTMP %{ffdir}/firefox -register -%{__rm} -rf $MOZTMP/.mozilla - %postun update-desktop-database %{_datadir}/applications umask 022 @@ -298,11 +246,8 @@ fi %preun # is it a final removal? if [ $1 -eq 0 ]; then - %{__rm} -rf %{ffdir}/chrome/overlayinfo %{__rm} -rf %{ffdir}/components - %{__rm} -f %{ffdir}/chrome/*.rdf %{__rm} -rf %{ffdir}/extensions - %{__rm} -f %{ffdir}/components.ini fi %files @@ -314,29 +259,26 @@ fi %{ffdir} %{_libdir}/mozilla -%ghost %{ffdir}/chrome/chrome.rdf -%ghost %{ffdir}/chrome/overlayinfo/browser/content/overlays.rdf -%ghost %{ffdir}/chrome/overlayinfo/communicator/content/overlays.rdf -%ghost %{ffdir}/chrome/overlayinfo/inspector/content/overlays.rdf -%ghost %{ffdir}/chrome/overlayinfo/messenger/content/overlays.rdf -%ghost %{ffdir}/chrome/overlayinfo/navigator/content/overlays.rdf -%ghost %{ffdir}/components.ini %ghost %{ffdir}/components/compreg.dat %ghost %{ffdir}/components/xpti.dat -%ghost %{ffdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -%ghost %{ffdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -%ghost %{ffdir}/extensions/installed-extensions-processed.txt -%ghost %{ffdir}/extensions/Extensions.rdf #--------------------------------------------------------------------- %changelog +* Mon Jul 18 2005 Christopher Aillon <caillon@redhat.com> 0:1.1-0.0.1.deerpark.alpha2 +- Update to Deer Park Alpha 2 + - STILL TODO: + - This build is not localized yet. + - Theme issues not yet resolved. + - Building on ppc platforms is busted, disable them for now. + - Forward port all remaining patches. + * Sun Jul 17 2005 Christopher Aillon <caillon@redhat.com> 0:1.0.4-6 - Avoid a crash on 64bit platforms - Use system NSPR -* Thu Jun 23 2005 Kristian Høgsberg <krh@redhat.com> 0:1.0.45 +* Thu Jun 23 2005 Kristian Høgsberg <krh@redhat.com> 0:1.0.4-5 - Add firefox-1.0-pango-cairo.patch to get rid of the last few Xft references, fixing the "no fonts" problem. - Copy over changes from FC4 branch. @@ -1,3 +1,3 @@ b628d5f24a49ab15d1943b7d694edd90 firefox-gnomestripe-0.1.tar.gz -9a451a06236c80c00e8246f378d813bb deerpark-alpha1-source.tar.bz2 2a9c2ae93baa98b96d28db380a805442 firefox-1.0-locales.tar.bz2 +109b48c9be1f7b80bf45c7ad40601ac5 firefox-1.1a2-source.tar.bz2 |