]> git.pld-linux.org Git - packages/firefox.git/commitdiff
- updated to 3.6.3
authorJakub Bogusz <qboosh@pld-linux.org>
Wed, 26 May 2010 07:05:02 +0000 (07:05 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
- partial sync with iceweasel.spec

Changed files:
    mozilla-firefox-branding.patch -> 1.4
    mozilla-firefox-install.patch -> 1.3
    mozilla-firefox-libpng.patch -> 1.1
    mozilla-firefox-no-subshell.patch -> 1.1
    mozilla-firefox-nss_cflags.patch -> 1.2
    mozilla-firefox-prefs.patch -> 1.5
    mozilla-firefox.desktop -> 1.7
    mozilla-firefox.sh -> 1.19
    mozilla-firefox.spec -> 1.269

mozilla-firefox-branding.patch
mozilla-firefox-install.patch
mozilla-firefox-libpng.patch [new file with mode: 0644]
mozilla-firefox-no-subshell.patch [new file with mode: 0644]
mozilla-firefox-nss_cflags.patch
mozilla-firefox-prefs.patch
mozilla-firefox.desktop
mozilla-firefox.sh
mozilla-firefox.spec

index 07d5574abc94aebb7919a2206c0d5239bf13dc21..87ffcee033a1c7939661b2d187e6de9c215baec9 100644 (file)
@@ -1,55 +1,21 @@
-diff -ur mozilla.orig/browser/app/firefox-branding.js mozilla/browser/app/firefox-branding.js
---- mozilla.orig/browser/app/firefox-branding.js       2008-06-21 12:55:30.000000000 +0200
-+++ mozilla/browser/app/firefox-branding.js    2008-06-21 15:31:20.000000000 +0200
-@@ -1,5 +1,6 @@
--pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/");
--pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/");
-+pref("browser.startup.homepage_override.mstone", "ignore");
-+pref("startup.homepage_override_url","");
-+pref("startup.homepage_welcome_url","");
- // URL user can browse to manually if for some reason all update installation
- // attempts fail.
- pref("app.update.url.manual", "http://www.mozilla.org/products/%APP%/");
-@@ -8,7 +9,7 @@
- pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/");
+--- mozilla.orig/browser/app/application.ini   2010-02-04 15:47:13.000000000 +0100
++++ mozilla/browser/app/application.ini        2010-02-04 15:48:46.000000000 +0100
+@@ -37,8 +37,8 @@
  
- // Release notes URL
--pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/");
-+pref("app.releaseNotesURL", "http://www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/");
- // Search codes belong only in builds with official branding
- pref("browser.search.param.yahoo-fr", "");
-diff -ur mozilla.orig/browser/base/content/browserconfig.properties mozilla/browser/base/content/browserconfig.properties
---- mozilla.orig/browser/base/content/browserconfig.properties 2008-06-21 12:55:29.000000000 +0200
-+++ mozilla/browser/base/content/browserconfig.properties      2008-06-21 15:05:50.000000000 +0200
-@@ -1,2 +1,2 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/minefield/
-+browser.startup.homepage=http://www.pld-linux.org/
-diff -ur mozilla.orig/browser/locales/en-US/chrome/branding/brand.dtd mozilla/browser/locales/en-US/chrome/branding/brand.dtd
---- mozilla.orig/browser/locales/en-US/chrome/branding/brand.dtd       2008-06-21 12:55:30.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/branding/brand.dtd    2008-06-21 16:13:49.000000000 +0200
-@@ -1,3 +1,3 @@
--<!ENTITY  brandShortName        "Minefield">
--<!ENTITY  brandFullName         "Minefield">            
-+<!ENTITY  brandShortName        "Firefox Community Edition">
-+<!ENTITY  brandFullName         "Firefox Community Edition">            
- <!ENTITY  vendorShortName       "Mozilla">
-diff -ur mozilla.orig/browser/locales/en-US/chrome/branding/brand.properties mozilla/browser/locales/en-US/chrome/branding/brand.properties
---- mozilla.orig/browser/locales/en-US/chrome/branding/brand.properties        2008-06-21 12:55:30.000000000 +0200
-+++ mozilla/browser/locales/en-US/chrome/branding/brand.properties     2008-06-21 16:14:14.000000000 +0200
-@@ -1,3 +1,3 @@
--brandShortName=Minefield
--brandFullName=Minefield
-+brandShortName=Firefox Community Edition
-+brandFullName=Firefox Community Edition
- vendorShortName=Mozilla
-diff -ur mozilla.orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
---- mozilla.orig/browser/locales/en-US/profile/bookmarks.html  2008-06-22 15:20:46.000000000 +0200
-+++ mozilla/browser/locales/en-US/profile/bookmarks.html       2008-06-22 17:42:09.000000000 +0200
-@@ -23,4 +23,12 @@
-         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">Get Involved</A>
-         <DT><A HREF="http://en-US.www.mozilla.com/en-US/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">About Us</A>
+ #filter substitution
+ [App]
+-Vendor=Mozilla
+-Name=Firefox
++Vendor=
++Name=Firefox Community Edition
+ Version=@APP_VERSION@
+ BuildID=@GRE_BUILDID@
+ #ifdef MOZ_SOURCE_REPO
+--- mozilla.orig/browser/locales/generic/profile/bookmarks.html.in     2009-06-24 10:20:29.000000000 +0200
++++ mozilla/browser/locales/generic/profile/bookmarks.html.in  2009-06-28 15:29:30.000000000 +0200
+@@ -24,4 +24,12 @@
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+         <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
      </DL><p>
 +    <DT><H3>PLD Linux Distribution</H3>
 +    <DL><p>
index 73a35306a817f2a24c6b6cc11cdc633c7d0a58bc..5ef4da6aaea74c5442b290d1524c64daf2f5a25f 100644 (file)
@@ -1,37 +1,62 @@
---- mozilla/toolkit/mozapps/installer/packager.mk      2006-12-23 03:38:32.302235167 +0200
-+++ mozilla/toolkit/mozapps/installer/packager.mk      2008-03-05 22:59:55.020447000 +0000
-@@ -328,13 +328,13 @@
+--- mozilla/toolkit/mozapps/installer/packager.mk.org  2010-01-21 21:10:00.234466295 +0100
++++ mozilla/toolkit/mozapps/installer/packager.mk      2010-01-21 21:10:29.847369216 +0100
+@@ -362,13 +362,13 @@
  # NOTE: this must be a tar now that dist links into the tree so that we
  # do not strip the binaries actually in the tree.
        @echo "Creating package directory..."
--      @mkdir $(DIST)/$(MOZ_PKG_APPNAME)
-+      @mkdir -p $(DESTDIR)$(MOZ_PKG_APPDIR)
+-      @mkdir $(DIST)/$(MOZ_PKG_DIR)
++      @mkdir -p $(DESTDIR)/$(MOZ_PKG_APPDIR)
  ifdef MOZ_PKG_MANIFEST
        $(RM) -rf $(DIST)/xpt
-       $(call PACKAGER_COPY, "$(DIST)",\
--               "$(DIST)/$(MOZ_PKG_APPNAME)", \
-+               "$(DESTDIR)/$(MOZ_PKG_APPDIR)", \
+       $(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+-               "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
++               "$(call core_abspath,$(DESTDIR)/$(MOZ_PKG_APPDIR))", \
                "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
--      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_APPNAME)/components -v -x "$(XPIDL_LINK)"
-+      $(PERL) $(topsrcdir)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/components -v -x "$(XPIDL_LINK)"
+-      $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
++      $(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DESTDIR)/$(MOZ_PKG_APPDIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
  else # !MOZ_PKG_MANIFEST
  ifeq ($(MOZ_PKG_FORMAT),DMG)
  # If UNIVERSAL_BINARY, the package will be made from an already-prepared
-@@ -343,7 +343,7 @@
-       @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_APPNAME)
+@@ -377,11 +377,11 @@
+ ifndef STAGE_SDK
+       @cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
+ else
+-      @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
++      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
+ endif
  endif
  else
--      @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_APPNAME); tar -xf -)
+-      @cd $(DIST)/bin && tar $(TAR_CREATE_FLAGS) - * | (cd ../$(MOZ_PKG_DIR); tar -xf -)
 +      cp -rfLp $(DIST)/bin/* $(DESTDIR)$(MOZ_PKG_APPDIR)
- endif # DMG
- endif # MOZ_PKG_MANIFEST
- ifndef PKG_SKIP_STRIP
-@@ -375,7 +375,7 @@
+       @echo "Linking XPT files..."
+       @rm -rf $(DIST)/xpt
+       @$(NSINSTALL) -D $(DIST)/xpt
+--- mozilla/browser/app/Makefile.in    2008-06-22 22:54:03.000000000 +0200
++++ mozilla/browser/app/Makefile.in    2008-06-23 10:34:59.000000000 +0200
+@@ -397,7 +397,7 @@
+       rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)
+       $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign
+ ifdef LIBXUL_SDK
+-      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/firefox-bin
++      cp $(LIBXUL_DIST)/bin/$(XR_STUB_NAME) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(MOZ_APP_NAME)-bin
+ else
+       rm -f $(DIST)/$(APP_NAME).app/Contents/MacOS/$(PROGRAM)
+       rsync -aL $(PROGRAM) $(DIST)/$(APP_NAME).app/Contents/MacOS
+@@ -359,7 +359,7 @@
+ else
+ ifdef LIBXUL_SDK
+ libs::
+-      cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++      cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)
  endif
-       @echo "Removing unpackaged files..."
- ifdef NO_PKG_FILES
--      cd $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH); rm -rf $(NO_PKG_FILES)
-+      cd $(DESTDIR)$(MOZ_PKG_APPDIR)$(_BINPATH); rm -rf $(NO_PKG_FILES)
  endif
- ifdef MOZ_PKG_REMOVALS
-       $(SYSINSTALL) $(MOZ_PKG_REMOVALS_GEN) $(DIST)/$(STAGEPATH)$(MOZ_PKG_APPNAME)$(_BINPATH)
+@@ -433,7 +433,7 @@
+       rsync -a --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks
+ else
+       $(NSINSTALL) -D $(DIST)/bin/xulrunner
+-      (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
++      cp -rfRp $(LIBXUL_SDK)/bin $(DIST)/bin/xulrunner
+ endif # cocoa
+ endif # SKIP_COPY_XULRUNNER
+ endif # LIBXUL_SDK
diff --git a/mozilla-firefox-libpng.patch b/mozilla-firefox-libpng.patch
new file mode 100644 (file)
index 0000000..f512416
--- /dev/null
@@ -0,0 +1,11 @@
+--- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp      2010-01-17 00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)
diff --git a/mozilla-firefox-no-subshell.patch b/mozilla-firefox-no-subshell.patch
new file mode 100644 (file)
index 0000000..677d0aa
--- /dev/null
@@ -0,0 +1,23 @@
+--- iceweasel-3.0.10/mozilla/build/unix/run-mozilla.sh~        2007-09-04 20:09:31.000000000 +0300
++++ iceweasel-3.0.10/mozilla/build/unix/run-mozilla.sh 2009-05-05 19:20:55.718561642 +0300
+@@ -438,7 +438,7 @@
+ then
+       moz_debug_program ${1+"$@"}
+ else
+-      moz_run_program ${1+"$@"}
++      exec "$MOZ_PROGRAM" ${1+"$@"}
+ fi
+ exit $exitcode
+--- iceweasel-3.0.10/mozilla/build/unix/mozilla.in~    2007-10-05 10:29:26.000000000 +0300
++++ iceweasel-3.0.10/mozilla/build/unix/mozilla.in     2009-05-05 19:26:08.278322082 +0300
+@@ -135,8 +135,5 @@
+ then
+   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
+ fi
+-"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+-exitcode=$?
+-
+-exit $exitcode
++exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
+ # EOF.
index 90d01543ae6f2f946f9e17742375befab1497a8b..1e2fbd24dc5b097f1b307c5b98fcbb393687bfbe 100644 (file)
@@ -1,42 +1,31 @@
---- mozilla/config/autoconf.mk.in.orig 2008-06-19 17:55:40.000000000 +0200
-+++ mozilla/config/autoconf.mk.in      2008-06-19 18:45:18.000000000 +0200
-@@ -276,7 +276,7 @@
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
--OS_INCLUDES   = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
-+OS_INCLUDES   = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
- OS_LIBS               = @LIBS@
- ACDEFINES     = @MOZ_DEFINES@
 --- mozilla/config/rules.mk.orig       2008-06-19 18:45:00.000000000 +0200
 +++ mozilla/config/rules.mk    2008-06-19 18:42:40.000000000 +0200
-@@ -1235,23 +1235,23 @@
+@@ -1365,23 +1365,23 @@
  # Rules for building native targets must come first because of the host_ prefix
- host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS)
        $(REPORT_BUILD)
 -      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS)
        $(REPORT_BUILD)
 -      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS)
        $(REPORT_BUILD)
 -      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS)
        $(REPORT_BUILD)
 -      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in
+ host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS)
        $(REPORT_BUILD)
 -      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS)
 +      $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS)
  
- %: %.c Makefile Makefile.in
+ %: %.c $(GLOBAL_DEPS)
        $(REPORT_BUILD)
index e02c3f07851d6f63d1aadd414305b0545a99479f..f38579f876a56da96ea95912072fbb47af5a1a7e 100644 (file)
@@ -25,6 +25,14 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile
  
  // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
  // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
+@@ -391,6 +394,7 @@
+ pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse
+ // l12n and i18n
++pref("intl.locale.matchOS", true);
+ pref("intl.accept_languages", "chrome://global/locale/intl.properties");
+ pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties");
+ pref("intl.charsetmenu.browser.more1",  "chrome://global/locale/intl.properties");
 @@ -445,7 +445,7 @@
  pref("alerts.totalOpenTime", 4000);
  
@@ -47,45 +55,6 @@ diff -ur mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile
  
  // Non-enhanced mode (local url lists) URL list to check for updates
  pref("browser.safebrowsing.provider.0.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client={moz:client}&appver={moz:version}&pver=2.1");
-@@ -739,7 +739,7 @@
- // 0 - don't pre-populate anything
- // 1 - pre-populate site URL, but don't fetch certificate
- // 2 - pre-populate site URL and pre-fetch certificate
--pref("browser.ssl_override_behavior", 1);
-+pref("browser.ssl_override_behavior", 2);
- // Controls the display of domain in the identity box for SSL connections.
- // 0 - do not show domain
-diff -ur mozilla.orig/browser/base/content/baseMenuOverlay.xul mozilla/browser/base/content/baseMenuOverlay.xul
---- mozilla.orig/browser/base/content/baseMenuOverlay.xul      2008-06-21 12:55:29.000000000 +0200
-+++ mozilla/browser/base/content/baseMenuOverlay.xul   2008-06-21 15:08:33.000000000 +0200
-@@ -97,12 +97,6 @@
-                   label="&helpReleaseNotes.label;"
-                   oncommand="openReleaseNotes(event)"
-                   onclick="checkForMiddleClick(this, event);"/>
--        <menuseparator id="updateSeparator"/>
--        <menuitem id="checkForUpdates"
--                  accesskey="&updateCmd.accesskey;"
--                  label="&updateCmd.label;"
--                  class="menuitem-iconic"
--                  oncommand="checkForUpdates();"/>
-         <menuseparator id="aboutSeparator"/>
-         <menuitem id="aboutName"
-                   accesskey="&aboutCmd.accesskey;"
-diff -ur mozilla.orig/browser/components/preferences/advanced.xul mozilla/browser/components/preferences/advanced.xul
---- mozilla.orig/browser/components/preferences/advanced.xul   2008-06-21 12:55:30.000000000 +0200
-+++ mozilla/browser/components/preferences/advanced.xul        2008-06-21 16:01:22.000000000 +0200
-@@ -267,10 +267,6 @@
-         <tabpanel id="updatePanel" orient="vertical" align="start">
-           <label control="autoUpdateGroup">&autoCheck.label;</label>
-           <vbox class="indent" id="autoUpdateGroup" role="group">
--            <checkbox id="enableAppUpdate"
--                      label="&enableAppUpdate.label;"
--                      accesskey="&enableAppUpdate.accesskey;"
--                      preference="app.update.enabled"/>
-             <checkbox id="enableAddonUpdate"
-                       label="&enableAddonsUpdate.label;"
-                       accesskey="&enableAddonsUpdate.accesskey;"
 diff -ur mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd mozilla/browser/locales/en-US/chrome/overrides/netError.dtd
 --- mozilla.orig/browser/locales/en-US/chrome/overrides/netError.dtd   2008-06-21 12:55:30.000000000 +0200
 +++ mozilla/browser/locales/en-US/chrome/overrides/netError.dtd        2008-06-22 13:52:26.000000000 +0200
index 0b92e93965d098f14c1760ef897675b555c6ce78..547c994a5acd9a2009b56a9cee116c5976d4bfbe 100644 (file)
@@ -2,12 +2,79 @@
 Name=Firefox Community Edition
 Name[pl]=Firefox Community Edition
 GenericName=Web Browser
+GenericName[af]=Web Blaaier
+GenericName[ar]=متصفح ويب
+GenericName[az]=Veb Səyyahı
+GenericName[bg]=Браузър
+GenericName[bn]=ওয়েব ব্রাউজার
+GenericName[br]=Furcher ar Gwiad
+GenericName[bs]=WWW Preglednik
+GenericName[ca]=Fullejador web
+GenericName[cs]=WWW prohlížeč
+GenericName[cy]=Porydd Gwe
+GenericName[da]=Browser
+GenericName[de]=Web-Browser
+GenericName[el]=Περιηγητής Ιστού
+GenericName[eo]=TTT-legilo
+GenericName[es]=Navegador web
+GenericName[et]=Veebilehitseja
+GenericName[eu]=Web arakatzailea
+GenericName[fa]=مرورگر وب
+GenericName[fi]=WWW-selain
+GenericName[fo]=Alnótsfar
+GenericName[fr]=Navigateur web
+GenericName[gl]=Navegador Web
+GenericName[he]=דפדפן אינטרנט
+GenericName[hi]=वेब ब्राउज़र
+GenericName[hr]=Web preglednik
+GenericName[hu]=Webböngésző
+GenericName[is]=Vafri
+GenericName[it]=Browser Web
+GenericName[ja]=ウェブブラウザ
+GenericName[ko]=웹 브라우저
+GenericName[lo]=ເວັບບຣາວເຊີ
+GenericName[lt]=Žiniatinklio naršyklė
+GenericName[lv]=Web Pārlūks
+GenericName[mk]=Прелистувач на Интернет
+GenericName[mn]=Веб-Хөтөч
+GenericName[nb]=Nettleser
+GenericName[nds]=Nettkieker
+GenericName[nl]=Webbrowser
+GenericName[nn]=Nettlesar
+GenericName[nso]=Seinyakisi sa Web
+GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
 GenericName[pl]=Przeglądarka WWW
+GenericName[pt_BR]=Navegador Web
+GenericName[pt]=Navegador Web
+GenericName[ro]=Navigator de web
+GenericName[ru]=Веб-браузер
+GenericName[se]=Fierpmádatlogan
+GenericName[sk]=Webový prehliadač
+GenericName[sl]=Spletni brskalnik
+GenericName[sr@latin]=Veb pretraživač
+GenericName[sr]=Веб претраживач
+GenericName[ss]=Ibrawuza yeWeb
+GenericName[sv]=Webbläsare
+GenericName[ta]=வலை உலாவி
+GenericName[tg]=Тафсиргари вэб
+GenericName[th]=เว็บบราวเซอร์
+GenericName[tr]=Web Tarayıcı
+GenericName[uk]=Навігатор Тенет
+GenericName[uz]=Веб-браузер
+GenericName[ven]=Buronza ya Webu
+GenericName[vi]=Trình duyệt Web
+GenericName[wa]=Betchteu waibe
+GenericName[xh]=Umkhangeli zincwadi we Web
+GenericName[zh_CN]=网页浏览器
+GenericName[zh_TW]=網頁瀏覽器
+GenericName[zu]=Umcingi we-Web
 Comment=Browse the Web powered by Mozilla technology
 Comment[pl]=Przeglądarka WWW oparta o technologię Mozilli
-Exec=mozilla-firefox
+Exec=mozilla-firefox %u
 Icon=mozilla-firefox
 Terminal=false
+MimeType=text/html;
 Type=Application
+StartupNotify=true
 Categories=GTK;Network;WebBrowser;
 # vi: encoding=utf-8
index 8284a7c4d0c546505cdf8c79103fd8868055d220..870f8751bc50225d5d97906ec22cd7d0c61709fa 100644 (file)
@@ -3,33 +3,6 @@
 
 LIBDIR="@LIBDIR@/mozilla-firefox"
 
-MOZARGS=
-MOZLOCALE="$(/usr/bin/locale | grep "^LC_MESSAGES=" | \
-               sed -e "s|LC_MESSAGES=||g" -e "s|\"||g" )"
-for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
-       eval MOZLANG="$(echo $MOZLANG | sed -e "s|_\([^.]*\).*|-\1|g")"
-
-       if [ -f $LIBDIR/chrome/$MOZLANG.jar ]; then
-               MOZARGS="-UILocale $MOZLANG"
-               break
-       fi
-done
-
-if [ -z "$MOZARGS" ]; then
-       # try harder
-       for MOZLANG in $(echo $LANGUAGE | tr ":" " ") $MOZLOCALE; do
-               eval MOZLANG="$(echo $MOZLANG | sed -e "s|_.*||g")"
-
-               LANGFILE=$(echo $LIBDIR/chrome/${MOZLANG}*.jar \
-                               | sed 's/\s.*//g' )
-               if [ -f "$LANGFILE" ]; then
-                       MOZLANG=$(basename "$LANGFILE" | sed 's/\.jar//')
-                       MOZARGS="-UILocale $MOZLANG"
-                       break
-               fi
-       done
-fi
-
 # compreg.dat and/or chrome.rdf will screw things up if it's from an
 # older version.  http://bugs.gentoo.org/show_bug.cgi?id=63999
 for f in ~/{.,.mozilla/}firefox/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
@@ -39,32 +12,28 @@ for f in ~/{.,.mozilla/}firefox/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do
        fi
 done
 
-if [ -n "$MOZARGS" ]; then
-       FIREFOX="$LIBDIR/firefox $MOZARGS"
-else
-       FIREFOX="$LIBDIR/firefox"
-fi
+FIREFOX="$LIBDIR/firefox"
+PWD=${PWD:-$(pwd)}
 
-if [ "$1" == "-remote" ]; then
+if [ "$1" = "-remote" ]; then
        exec $FIREFOX "$@"
 else
-       PING=`$FIREFOX -remote 'ping()' 2>&1 >/dev/null`
-       if [ -n "$PING" ]; then
-               if [ -f "`pwd`/$1" ]; then
-                       exec $FIREFOX "file://`pwd`/$1"
+       if ! $FIREFOX -remote 'ping()' 2>/dev/null; then
+               if [ -f "$PWD/$1" ]; then
+                       exec $FIREFOX "file://$PWD/$1"
                else
                        exec $FIREFOX "$@"
                fi
        else
                if [ -z "$1" ]; then
                        exec $FIREFOX -remote 'xfeDoCommand(openBrowser)'
-               elif [ "$1" == "-mail" ]; then
+               elif [ "$1" = "-mail" ]; then
                        exec $FIREFOX -remote 'xfeDoCommand(openInbox)'
-               elif [ "$1" == "-compose" ]; then
+               elif [ "$1" = "-compose" ]; then
                        exec $FIREFOX -remote 'xfeDoCommand(composeMessage)'
                else
-                       if [ -f "`pwd`/$1" ]; then
-                               URL="file://`pwd`/$1"
+                       if [ -f "$PWD/$1" ]; then
+                               URL="file://$PWD/$1"
                        else
                                URL="$1"
                        fi
index cf67b37a9f6530a2a5640686d5e46a324958dc17..29a5c610e162cda56b6c2921fb08af7256bd14e1 100644 (file)
 %bcond_without gnomevfs        # disable GNOME comp. (gconf+libgnome+gnomevfs) and gnomevfs ext.
 %bcond_without gnome           # disable all GNOME components (gnome+gnomeui+gnomevfs)
 %bcond_without kerberos        # disable krb5 support
-%bcond_with    xulrunner       # build with system xulrunner
+%bcond_without xulrunner       # system xulrunner
 
 %if %{without gnome}
 %undefine      with_gnomeui
 %undefine      with_gnomevfs
 %endif
 
+# convert firefox release number to platform version: 3.6.x -> 1.9.2.x
+%define                xulrunner_main  1.9.2
+%define                xulrunner_ver   %(v=%{version}; echo %{xulrunner_main}${v#3.6})
+
+%if %{without xulrunner}
+# The actual sqlite version (see RHBZ#480989):
+%define                sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo ERROR)
+%endif
+
 Summary:       Firefox Community Edition web browser
 Summary(pl.UTF-8):     Firefox Community Edition - przeglądarka WWW
 Name:          mozilla-firefox
-Version:       3.0.10
+Version:       3.6.3
 Release:       1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
-Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2
-# Source0-md5: 1012e835a5c130d18479bccdee240640
+Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
+# Source0-md5: 5e4541ab23084b7b14ba228291ce2688
 Source1:       %{name}.desktop
 Source2:       %{name}.sh
 Patch0:                %{name}-install.patch
@@ -41,59 +50,61 @@ Patch4:             %{name}-ti-agent.patch
 Patch5:                %{name}-branding.patch
 Patch6:                %{name}-prefs.patch
 Patch7:                %{name}-nss_cflags.patch
+Patch8:                %{name}-no-subshell.patch
+Patch9:                %{name}-libpng.patch
 URL:           http://www.mozilla.org/projects/firefox/
 %{?with_gnomevfs:BuildRequires:        GConf2-devel >= 1.2.1}
+BuildRequires: alsa-lib-devel
 BuildRequires: automake
+BuildRequires: bzip2-devel
 BuildRequires: cairo-devel >= 1.6.0
 BuildRequires: dbus-glib-devel >= 0.60
-BuildRequires: glib2-devel
 %{?with_gnomevfs:BuildRequires:        gnome-vfs2-devel >= 2.0}
 BuildRequires: gtk+2-devel >= 2:2.10
 %{?with_kerberos:BuildRequires:        heimdal-devel >= 0.7.1}
+BuildRequires: hunspell-devel
 BuildRequires: libIDL-devel >= 0.8.0
+BuildRequires: libdnet-devel
 %{?with_gnomevfs:BuildRequires:        libgnome-devel >= 2.0}
 %{?with_gnomeui:BuildRequires: libgnomeui-devel >= 2.2.0}
+BuildRequires: libiw-devel
 BuildRequires: libjpeg-devel >= 6b
+BuildRequires: libnotify-devel
 BuildRequires: libpng(APNG)-devel >= 0.10
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: libstdc++-devel
-BuildRequires: nspr-devel >= 1:4.7
-BuildRequires: nss-devel >= 1:3.12-2
+BuildRequires: nspr-devel >= 1:4.8
+BuildRequires: nss-devel >= 1:3.12.3
 BuildRequires: pango-devel >= 1:1.10.0
 BuildRequires: perl-modules >= 5.004
 BuildRequires: pkgconfig
 BuildRequires: python-modules
-BuildRequires: sqlite3-devel >= 3.5.9
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.453
-BuildRequires: startup-notification-devel
-%if "%{pld_release}" == "ac"
-BuildRequires: XFree86-devel
-%else
+BuildRequires: sqlite3-devel >= 3.6.15
+BuildRequires: startup-notification-devel >= 0.8
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXft-devel >= 2.1
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXp-devel
 BuildRequires: xorg-lib-libXt-devel
-%endif
 %if %{with xulrunner}
-BuildRequires: xulrunner-devel >= 1.9-2
+BuildRequires: xulrunner-devel >= 2:%{xulrunner_ver}
 %endif
 BuildRequires: zip
 BuildRequires: zlib-devel >= 1.2.3
 Requires(post):        mktemp >= 1.5-18
-%if %{without xulrunner}
+%if %{with xulrunner}
+%requires_eq_to        xulrunner xulrunner-devel
+%else
 Requires:      browser-plugins >= 2.0
-%endif
 Requires:      cairo >= 1.6.0
-Requires:      gtk+2 >= 2:2.10
+Requires:      gtk+2 >= 2:2.18
 Requires:      libpng(APNG) >= 0.10
-Requires:      nspr >= 1:4.7
-Requires:      nss >= 1:3.12-2
-Requires:      pango >= 1:1.10.0
-Requires:      sqlite3 >= 3.5.9
-%if %{with xulrunner}
-%requires_eq_to        xulrunner xulrunner-devel
+Requires:      myspell-common
+Requires:      nspr >= 1:4.8
+Requires:      nss >= 1:3.12.3
+Requires:      sqlite3 >= %{sqlite_build_version}
 %endif
 Provides:      wwwbrowser
 Obsoletes:     mozilla-firebird
@@ -122,8 +133,10 @@ zgodnie z ideami ruchu otwartego oprogramowania oraz tworzoną z myślą
 o zgodności ze standardami, wydajnością i przenośnością.
 
 %prep
-%setup -qc -n %{name}-%{version}
+%setup -qc
+mv -f mozilla-%{xulrunner_main} mozilla
 cd mozilla
+
 %patch0 -p1
 
 %if "%{cc_version}" < "3.4"
@@ -145,14 +158,15 @@ cd mozilla
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p2
+%patch9 -p0
 
 %build
 cd mozilla
 cp -f %{_datadir}/automake/config.* build/autoconf
-cp -f %{_datadir}/automake/config.* nsprpub/build/autoconf
 
-cat << 'EOF' > .mozconfig
-. $topsrcdir/browser/config/mozconfig
+cat << EOF > .mozconfig
+. \$topsrcdir/browser/config/mozconfig
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-%{_target_cpu}
 
@@ -182,6 +196,8 @@ ac_add_options --disable-debug-modules
 ac_add_options --disable-logging
 ac_add_options --enable-optimize="%{rpmcflags} -Os"
 %endif
+ac_add_options --disable-strip
+ac_add_options --disable-strip-libs
 %if %{with tests}
 ac_add_options --enable-tests
 %else
@@ -201,19 +217,22 @@ ac_add_options --disable-crashreporter
 ac_add_options --disable-installer
 ac_add_options --disable-javaxpcom
 ac_add_options --disable-updater
-ac_add_options --disable-strip
 ac_add_options --disable-xprint
+ac_add_options --enable-canvas
+ac_add_options --enable-libxul
+ac_add_options --enable-pango
 ac_add_options --enable-startup-notification
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
-ac_add_options --enable-libxul
 ac_add_options --enable-xinerama
 ac_add_options --with-distribution-id=org.pld-linux
 %if %{with xulrunner}
-ac_add_options --with-libxul-sdk=%{_libdir}/xulrunner-sdk
+ac_add_options --with-libxul-sdk=$(pkg-config --variable=sdkdir libxul)
 %endif
 ac_add_options --with-pthreads
+ac_add_options --with-system-bz2
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -235,15 +254,16 @@ install -d \
        $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
        $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%if %{without xulrunner}
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-%endif
 
 %{__make} -C obj-%{_target_cpu}/browser/installer stage-package \
        DESTDIR=$RPM_BUILD_ROOT \
        MOZ_PKG_APPDIR=%{_libdir}/%{name} \
        PKG_SKIP_STRIP=1
 
+install -d \
+       $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
@@ -255,6 +275,7 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 %endif
+
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
 ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
@@ -274,17 +295,19 @@ ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
 
-install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+cp -a browser/branding/unofficial/content/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-# files created by regxpcom and firefox -register
+# files created by firefox -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 
-# what's this? it's content is invalid anyway.
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/old-homepage-default.properties
+%if %{with xulrunner}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
+%endif
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/LICENSE
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/README.txt
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/components/components.list
 
 cat << 'EOF' > $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 #!/bin/sh
@@ -297,7 +320,6 @@ export HOME=$(mktemp -d)
 # also TMPDIR could be pointing to sudo user's homedir
 unset TMPDIR TMP || :
 
-#LD_LIBRARY_PATH=%{_libdir}/%{name}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} %{_libdir}/%{name}/regxpcom
 %{_libdir}/%{name}/firefox -register
 
 rm -rf $HOME
@@ -320,16 +342,12 @@ exit 0
 
 %post
 %{_sbindir}/%{name}-chrome+xpcom-generate
-%if %{without xulrunner}
 %update_browser_plugins
-%endif
 
 %postun
-%if %{without xulrunner}
 if [ "$1" = 0 ]; then
        %update_browser_plugins
 fi
-%endif
 
 %files
 %defattr(644,root,root,755)
@@ -337,14 +355,11 @@ fi
 %attr(755,root,root) %{_bindir}/firefox
 %attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
 
-%if %{without xulrunner}
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
-%endif
 
 %dir %{_libdir}/%{name}
-%attr(755,root,root) %{_libdir}/%{name}/libjemalloc.so
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
 %attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
@@ -365,8 +380,6 @@ fi
 
 %dir %{_libdir}/%{name}/components
 
-%{_libdir}/%{name}/components/aboutRights.js
-%{_libdir}/%{name}/components/aboutRobots.js
 %{_libdir}/%{name}/components/FeedConverter.js
 %{_libdir}/%{name}/components/FeedWriter.js
 %{_libdir}/%{name}/components/WebContentConverter.js
@@ -376,9 +389,8 @@ fi
 %{_libdir}/%{name}/components/nsBrowserGlue.js
 %{_libdir}/%{name}/components/nsMicrosummaryService.js
 %{_libdir}/%{name}/components/nsPlacesTransactionsService.js
+%{_libdir}/%{name}/components/nsPrivateBrowsingService.js
 %{_libdir}/%{name}/components/nsSafebrowsingApplication.js
-%{_libdir}/%{name}/components/nsSearchService.js
-%{_libdir}/%{name}/components/nsSearchSuggestions.js
 %{_libdir}/%{name}/components/nsSessionStartup.js
 %{_libdir}/%{name}/components/nsSessionStore.js
 %{_libdir}/%{name}/components/nsSetDefaultBrowser.js
@@ -386,6 +398,8 @@ fi
 %if %{without xulrunner}
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/components/FeedProcessor.js
+%{_libdir}/%{name}/components/GPSDGeolocationProvider.js
+%{_libdir}/%{name}/components/NetworkGeolocationProvider.js
 %{_libdir}/%{name}/components/jsconsole-clhandler.js
 %{_libdir}/%{name}/components/nsAddonRepository.js
 %{_libdir}/%{name}/components/nsBadCertHandler.js
@@ -396,22 +410,29 @@ fi
 %{_libdir}/%{name}/components/nsDownloadManagerUI.js
 %{_libdir}/%{name}/components/nsExtensionManager.js
 %{_libdir}/%{name}/components/nsFilePicker.js
+%{_libdir}/%{name}/components/nsFormAutoComplete.js
 %{_libdir}/%{name}/components/nsHandlerService.js
 %{_libdir}/%{name}/components/nsHelperAppDlg.js
 %{_libdir}/%{name}/components/nsLivemarkService.js
 %{_libdir}/%{name}/components/nsLoginInfo.js
 %{_libdir}/%{name}/components/nsLoginManager.js
 %{_libdir}/%{name}/components/nsLoginManagerPrompter.js
+%{_libdir}/%{name}/components/nsPlacesAutoComplete.js
+%{_libdir}/%{name}/components/nsPlacesDBFlush.js
 %{_libdir}/%{name}/components/nsProxyAutoConfig.js
+%{_libdir}/%{name}/components/nsSearchService.js
+%{_libdir}/%{name}/components/nsSearchSuggestions.js
 %{_libdir}/%{name}/components/nsTaggingService.js
 %{_libdir}/%{name}/components/nsTryToClose.js
 %{_libdir}/%{name}/components/nsURLFormatter.js
 %{_libdir}/%{name}/components/nsUpdateService.js
+%{_libdir}/%{name}/components/nsUpdateTimerManager.js
 %{_libdir}/%{name}/components/nsUrlClassifierLib.js
 %{_libdir}/%{name}/components/nsUrlClassifierListManager.js
 %{_libdir}/%{name}/components/nsWebHandlerApp.js
 %{_libdir}/%{name}/components/pluginGlue.js
 %{_libdir}/%{name}/components/storage-Legacy.js
+%{_libdir}/%{name}/components/storage-mozStorage.js
 %{_libdir}/%{name}/components/txEXSLTRegExFunctions.js
 %endif
 
@@ -429,11 +450,11 @@ fi
 %attr(755,root,root) %{_libdir}/%{name}/components/libnkgnomevfs.so
 %endif
 
-%attr(755,root,root) %{_libdir}/%{name}/*.sh
 %attr(755,root,root) %{_libdir}/%{name}/firefox
+%dir %{_libdir}/%{name}/plugins
 %if %{without xulrunner}
+%attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
 %attr(755,root,root) %{_libdir}/%{name}/firefox-bin
-%dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %endif
@@ -456,8 +477,6 @@ fi
 # browserconfig
 %{_libdir}/%{name}/browserconfig.properties
 
-%{_libdir}/%{name}/README.txt
-
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
@@ -475,6 +494,6 @@ fi
 # the signature of the default theme
 %{_datadir}/%{name}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
 
-# files created by regxpcom and firefox -register
+# files created by firefox -register
 %ghost %{_libdir}/%{name}/components/compreg.dat
 %ghost %{_libdir}/%{name}/components/xpti.dat
This page took 0.095196 seconds and 4 git commands to generate.