diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | firefox.spec | 24 | ||||
| -rw-r--r-- | sources | 4 |
3 files changed, 22 insertions, 7 deletions
@@ -58,3 +58,4 @@ firefox-3.6.4.source.tar.bz2 /firefox-langpacks-16.0.1-20121011.tar.xz /firefox-16.0.2.source.tar.bz2 /firefox-langpacks-16.0.2-20121026.tar.xz +/firefox-langpacks-17.0-20121119.tar.xz diff --git a/firefox.spec b/firefox.spec index 7a9cc3b..eca866e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -17,16 +17,16 @@ %global xulrunner_version 17.0 %global xulrunner_version_max 17.1 -%global xulrunner_release 0.1 +%global xulrunner_release 1 %global alpha_version 0 -%global beta_version 6 +%global beta_version 0 %global rc_version 0 %global mozappdir %{_libdir}/%{name} %global langpackdir %{mozappdir}/langpacks %global tarballdir mozilla-release -%define official_branding 0 +%define official_branding 1 %define build_langpacks 1 %define include_debuginfo 0 @@ -55,13 +55,13 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 17.0 -Release: 0.1%{?pre_tag}%{?dist} +Release: 1%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20121115.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20121119.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -172,6 +172,11 @@ echo "ac_add_options --without-system-nspr" >> .mozconfig echo "ac_add_options --without-system-nss" >> .mozconfig %endif +# s390(x) fails to start with jemalloc enabled +%ifarch s390 s390x +echo "ac_add_options --disable-jemalloc" >> .mozconfig +%endif + #--------------------------------------------------------------------- %build @@ -187,6 +192,12 @@ MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \ %if %{?debug_build} MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') %endif +%ifarch s390 +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/') +%endif +%ifarch s390 %{arm} ppc +MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" +%endif export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS @@ -412,6 +423,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Nov 19 2012 Martin Stransky <stransky@redhat.com> - 17.0-1 +- Update to 17.0 + * Thu Nov 15 2012 Martin Stransky <stransky@redhat.com> - 17.0-0.1b6 - Update to 17.0 Beta 6 @@ -1,2 +1,2 @@ -95ee4ffd2520e2419b5e093bd5b7f5a2 firefox-17.0b6.source.tar.bz2 -ff3657bc2c1b7cdb5e03092de807462f firefox-langpacks-17.0b6-20121115.tar.xz +f40d59db4101b1d0b780aecb89994da2 firefox-17.0.source.tar.bz2 +fa190d51244454e781772304a701b4e3 firefox-langpacks-17.0-20121119.tar.xz |