diff options
| -rw-r--r-- | firefox-install-dir.patch | 40 | ||||
| -rw-r--r-- | firefox.sh.in | 6 | ||||
| -rw-r--r-- | firefox.spec | 16 |
3 files changed, 37 insertions, 25 deletions
diff --git a/firefox-install-dir.patch b/firefox-install-dir.patch index 7ba14f4..1c0d8d3 100644 --- a/firefox-install-dir.patch +++ b/firefox-install-dir.patch @@ -1,25 +1,23 @@ -diff -up firefox-7.0/mozilla-beta/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/config/autoconf.mk.in ---- firefox-7.0/mozilla-beta/config/autoconf.mk.in.old 2011-08-31 21:16:06.000000000 +0200 -+++ firefox-7.0/mozilla-beta/config/autoconf.mk.in 2011-09-06 12:08:00.859392269 +0200 -@@ -68,7 +68,7 @@ datadir = @datadir@ - mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +diff -up firefox-16.0/mozilla-release/config/baseconfig.mk.old firefox-16.0/mozilla-release/config/baseconfig.mk +--- firefox-16.0/mozilla-release/config/baseconfig.mk.old 2012-10-08 20:38:31.119228352 +0200 ++++ firefox-16.0/mozilla-release/config/baseconfig.mk 2012-10-08 20:38:57.618309057 +0200 +@@ -2,7 +2,7 @@ INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) + DIST = $(DEPTH)/dist - DIST = $(DEPTH)/dist -diff -up firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in ---- firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in.old 2011-08-31 21:16:16.000000000 +0200 -+++ firefox-7.0/mozilla-beta/js/src/config/autoconf.mk.in 2011-09-06 12:08:39.463500899 +0200 -@@ -61,7 +61,7 @@ libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ +diff -up firefox-16.0/mozilla-release/js/src/config/baseconfig.mk.old firefox-16.0/mozilla-release/js/src/config/baseconfig.mk +--- firefox-16.0/mozilla-release/js/src/config/baseconfig.mk.old 2012-10-08 20:38:37.756248430 +0200 ++++ firefox-16.0/mozilla-release/js/src/config/baseconfig.mk 2012-10-08 20:39:15.974365249 +0200 +@@ -1,6 +1,6 @@ + INCLUDED_AUTOCONF_MK = 1 --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZ_APP_NAME) - sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) + sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) - TOP_DIST = @TOP_DIST@ -diff -up firefox-7.0/mozilla-beta/Makefile.in.old firefox-7.0/mozilla-beta/Makefile.in + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/firefox.sh.in b/firefox.sh.in index 55f31f4..2d8890c 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -134,6 +134,12 @@ export FONTCONFIG_PATH GNOME_DISABLE_CRASH_DIALOG=1 export GNOME_DISABLE_CRASH_DIALOG +## +## Use /var/tmp instead of /tmp because of 1GB /tmp limit in Fedora 18 and later +## +TMPDIR="/var/tmp" +export TMPDIR + # OK, here's where all the real work gets done diff --git a/firefox.spec b/firefox.spec index 6d6a3de..fcbf333 100644 --- a/firefox.spec +++ b/firefox.spec @@ -28,13 +28,13 @@ #global shortname firefox #global mycomment Beta 4 -%global firefox_dir_ver 15 -%global xulrunner_version 15.0.1 +%global firefox_dir_ver 16 +%global xulrunner_version 16.0 %global xulrunner_release 1 %global alpha_version 0 %global beta_version 0 %global rc_version 0 -%global datelang 20120909 +%global datelang 20121008 %global mozappdir %{_libdir}/firefox %global langpackdir %{mozappdir}/langpacks @@ -68,7 +68,7 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 15.0.1 +Version: 16.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -443,6 +443,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/searchplugins %{mozappdir}/run-mozilla.sh %{mozappdir}/application.ini +%{mozappdir}/webapprt* %exclude %{mozappdir}/removed-files %{_datadir}/icons/hicolor/16x16/apps/firefox.png %{_datadir}/icons/hicolor/22x22/apps/firefox.png @@ -462,6 +463,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Oct 8 2012 Remi Collet <RPMS@FamilleCollet.com> - 16.0-1 +- Sync with rawhide, update to 16.0 + +* Mon Oct 8 2012 Jan Horak <jhorak@redhat.com> - 16.0-1 +- Update to 16.0 +- Use /var/tmp instead of /tmp (rhbz#860814) + * Sun Sep 9 2012 Remi Collet <RPMS@FamilleCollet.com> - 15.0.1-1 - update to 15.0.1 |