# HG changeset patch # User Wolfgang Rosenauer # Date 1394751347 -3600 # Node ID bfa2e0576454e3bad0312eb7dfbdde8e46d0b458 # Parent 6482e73722b6a2203caeacd546edb6b71e474a95 update to 28.0b9 minor specfile cleanup diff -r 6482e73722b6 -r bfa2e0576454 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Mon Feb 17 14:00:37 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Thu Mar 13 23:55:47 2014 +0100 @@ -1,8 +1,8 @@ ------------------------------------------------------------------- -Mon Feb 17 12:57:51 UTC 2014 - wr@rosenauer.org - -- update to Firefox 28.0b3 -- requires NSPR 4.10.3 +Thu Mar 13 22:36:34 UTC 2014 - wr@rosenauer.org + +- update to Firefox 28.0b9 +- requires NSPR 4.10.3 and NSS 3.15.5 - new build dependency: * libpulse diff -r 6482e73722b6 -r bfa2e0576454 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Feb 17 14:00:37 2014 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Mar 13 23:55:47 2014 +0100 @@ -51,7 +51,7 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.3 -BuildRequires: mozilla-nss-devel >= 3.15.4 +BuildRequires: mozilla-nss-devel >= 3.15.5 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -64,7 +64,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014021700 +%define releasedate 2014030600 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -172,7 +172,6 @@ Development files for Firefox to make packaging of addons easier. %if %localize - %package translations-common Summary: Common translations for Firefox Group: System/Localization @@ -228,7 +227,11 @@ %endif %prep +%if %localize %setup -q -n mozilla -b 7 -b 10 +%else +%setup -q -n mozilla +%endif cd $RPM_BUILD_DIR/mozilla %patch1 -p1 %patch2 -p1 @@ -302,7 +305,9 @@ ac_add_options --includedir=%{_includedir} ac_add_options --with-system-nspr ac_add_options --with-system-nss +%if %{localize} ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n +%endif #ac_add_options --with-system-jpeg # libjpeg-turbo is used internally #ac_add_options --with-system-png # doesn't work because of missing APNG support ac_add_options --with-system-zlib @@ -315,30 +320,20 @@ ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 -cat << EOF >> $MOZCONFIG ac_add_options --disable-gnomevfs ac_add_options --enable-gio -EOF %endif %if %suse_version < 1220 -cat << EOF >> $MOZCONFIG ac_add_options --disable-gstreamer -EOF %endif %if %branding -cat << EOF >> $MOZCONFIG ac_add_options --enable-official-branding -EOF %endif %if %suse_version > 1110 -cat << EOF >> $MOZCONFIG ac_add_options --enable-libproxy -EOF %endif %if ! %crashreporter -cat << EOF >> $MOZCONFIG ac_add_options --disable-crashreporter -EOF %endif # Disable neon for arm as it does not build correctly %ifarch %arm @@ -347,9 +342,7 @@ EOF %endif %ifnarch %ix86 x86_64 -cat << EOF >> $MOZCONFIG ac_add_options --disable-webrtc -EOF %endif make -f client.mk build diff -r 6482e73722b6 -r bfa2e0576454 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Mon Feb 17 14:00:37 2014 +0100 +++ b/MozillaFirefox/create-tar.sh Thu Mar 13 23:55:47 2014 +0100 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_28_0b3_RELEASE" +RELEASE_TAG="FIREFOX_28_0b9_RELEASE" VERSION="27.99" # mozilla