diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 51d93ff..aa76c7e 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 13 08:58:12 UTC 2019 - Wolfgang Rosenauer + +- Mozilla Firefox 69.0.3 + * Fixed Yahoo mail users being prompted to download files when + clicking on emails (bmo#1582848) +- devel package build can easily be disabled now + ------------------------------------------------------------------- Thu Oct 3 08:40:05 UTC 2019 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8ea8ec7..f29392f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -19,13 +19,13 @@ # changed with every update %define major 69 -%define mainver %major.0.2 -%define orig_version 69.0.2 +%define mainver %major.0.3 +%define orig_version 69.0.3 %define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20191001234643 -%define source_prefix firefox-%{orig_version} +%define devpkg 1 +%define releasedate 20191009172106 # always build with GCC as SUSE Security Team requires that %define clang_build 0 @@ -45,6 +45,7 @@ BuildArch: i686 # general build definitions %define progname firefox %define pkgname MozillaFirefox +%define srcname firefox %define appname Firefox %define progdir %{_prefix}/%_lib/%{progname} %define gnome_dir %{_prefix} @@ -139,7 +140,7 @@ License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ %if !%{with only_print_mozconfig} -Source: http://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz +Source: http://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in @@ -154,14 +155,14 @@ Source12: mozilla-get-app-id Source13: spellcheck.js Source14: https://github.com/openSUSE/firefox-scripts/raw/master/create-tar.sh Source15: firefox-appdata.xml -Source16: MozillaFirefox.changes +Source16: %{name}.changes # Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys # Note: these are for the openSUSE Firefox builds ONLY. For your own distribution, # please get your own set of keys. Source18: mozilla-api-key Source19: google-api-key -Source20: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/source/%{progname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc -Source21: https://ftp.mozilla.org/pub/%{progname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring +Source20: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}.source.tar.xz.asc +Source21: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}/KEY#/mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch Patch2: mozilla-kde.patch @@ -194,15 +195,16 @@ Patch102: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils -%if %branding -Requires: %{name}-branding > 44.0 -%endif +Requires: %{name}-branding >= 68 Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 # addon leads to startup crash (bnc#908892) Obsoletes: tracker-miner-firefox < 0.15 +%if 0%{?devpkg} == 0 +Obsoletes: %{name}-devel < %{version} +%endif # libproxy's mozjs pacrunner crashes FF (bnc#759123) %if 0%{?suse_version} < 1220 Obsoletes: libproxy1-pacrunner-mozjs <= 0.4.7 @@ -214,6 +216,7 @@ Mozilla Firefox is a standalone web browser, designed for standards compliance and performance. Its functionality can be enhanced via a plethora of extensions. +%if 0%{?devpkg} %package devel Summary: Devel package for %{appname} Group: Development/Tools/Other @@ -224,6 +227,7 @@ Requires: perl(XML::Simple) %description devel Development files for %{appname} to make packaging of addons easier. +%endif %if %localize %package translations-common @@ -249,7 +253,6 @@ This package contains rarely used languages for the user interface of %{appname}. %endif -%if %branding %package branding-upstream Summary: Upstream branding for %{appname} Group: Productivity/Networking/Web/Browsers @@ -268,7 +271,6 @@ Supplements: packageand(%{name}:branding-upstream) %description branding-upstream This package provides upstream look and feel for %{appname}. -%endif %if %crashreporter %package buildsymbols @@ -292,11 +294,11 @@ if (( $(stat -Lc%s "%{SOURCE7}") < MINSIZE)); then exit 1 fi -%setup -q -n %{source_prefix} -b 7 -b 10 +%setup -q -n %{srcname}-%{orig_version} -b 7 -b 10 %else -%setup -q -n %{source_prefix} +%setup -q -n %{srcname}-%{orig_version} %endif -cd $RPM_BUILD_DIR/%{source_prefix} +cd $RPM_BUILD_DIR/%{srcname}-%{orig_version} %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -493,9 +495,14 @@ make -C browser/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 grep amazondotcom dist/firefox/browser/omni.ja # copy tree into RPM_BUILD_ROOT mkdir -p %{buildroot}%{progdir} -cp -rf $RPM_BUILD_DIR/obj/dist/%{progname}/* %{buildroot}%{progdir} +cp -rf $RPM_BUILD_DIR/obj/dist/%{srcname}/* %{buildroot}%{progdir} mkdir -p %{buildroot}%{progdir}/distribution/extensions mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ +# renaming executables (for regular vs. ESR) +%if "%{srcname}" != "%{progname}" +mv %{buildroot}%{progdir}/%{srcname} %{buildroot}%{progdir}/%{progname} +mv %{buildroot}%{progdir}/%{srcname}-bin %{buildroot}%{progdir}/%{progname} +%endif # install gre prefs install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/ # install browser prefs @@ -504,13 +511,13 @@ install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/fi %if %localize mkdir -p %{buildroot}%{progdir}/browser/extensions truncate -s 0 %{_tmppath}/translations.{common,other} -sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales \ +sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{srcname}-%{orig_version}/browser/locales/shipped-locales \ | xargs -n 1 -I {} /bin/sh -c ' locale=$1 pushd $RPM_BUILD_DIR/compare-locales PYTHONPATH=lib \ scripts/compare-locales -m ../l10n-merged/$locale \ - ../%{source_prefix}/browser/locales/l10n.ini ../l10n $locale + ../%{srcname}-%{orig_version}/browser/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C browser/locales langpack-$locale @@ -546,7 +553,7 @@ find %{buildroot}%{progdir} -type f -name ".mkdir.done" -delete mkdir --parents %{buildroot}/usr/bin sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g -s:%%APPNAME:firefox:g +s:%%APPNAME:%{progname}:g s:%%PROFILE:.mozilla/firefox:g" \ %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh chmod 755 %{buildroot}%{progdir}/%{progname}.sh @@ -563,7 +570,8 @@ mkdir -p %{buildroot}%{_datadir}/mime/packages cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata mkdir -p %{buildroot}%{_datadir}/appdata -cp %{SOURCE15} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +sed "s:firefox.desktop:%{desktop_file_name}:g" \ + %{SOURCE15} > %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # install man-page mkdir -p %{buildroot}%{_mandir}/man1/ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1 @@ -593,6 +601,7 @@ rm -f %{buildroot}%{progdir}/run-mozilla.sh rm -f %{buildroot}%{progdir}/LICENSE rm -f %{buildroot}%{progdir}/precomplete rm -f %{buildroot}%{progdir}/update-settings.ini +%if 0%{?devpkg} # devel mkdir -p %{buildroot}%{_bindir} install -m 755 %SOURCE12 %{buildroot}%{_bindir} @@ -614,12 +623,7 @@ cat <<'FIN' >%{buildroot}%{_sysconfdir}/rpm/macros.%{progname} %%{__unzip} -q -d "$extdir" "%%1" \ %%{nil} FIN -# just dumping an xpi file there doesn't work... -#%%firefox_ext_install() \ -# extdir="%%{buildroot}%%{firefox_extdir}" \ -# mkdir -p "$extdir" \ -# cp "%%1" "$extdir" \ -# %%{nil} +%endif # fdupes %fdupes %{buildroot}%{progdir} %fdupes %{buildroot}%{_datadir} @@ -673,8 +677,8 @@ exit 0 %{progdir}/gtk2/libmozgtk.so %{progdir}/gmp-clearkey/ %attr(755,root,root) %{progdir}/%{progname}.sh -%{progdir}/firefox -%{progdir}/firefox-bin +%{progdir}/%{progname} +%{progdir}/%{progname}-bin %{progdir}/application.ini %{progdir}/chrome.manifest %{progdir}/dependentlibs.list @@ -705,13 +709,14 @@ exit 0 %doc %{_mandir}/man1/%{progname}.1.gz %{_datadir}/appdata/ +%if 0%{?devpkg} %files devel %defattr(-,root,root) %{_bindir}/mozilla-get-app-id %config %{_sysconfdir}/rpm/macros.%{progname} +%endif %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} @@ -725,11 +730,9 @@ exit 0 # this package does not need to provide files but is needed to fulfill # requirements if no other branding package is to be installed -%if %branding %files branding-upstream %defattr(-,root,root) %dir %{progdir} -%endif %if %crashreporter %files buildsymbols diff --git a/compare-locales.tar.xz b/compare-locales.tar.xz index d635f8c..cc1e02e 100644 --- a/compare-locales.tar.xz +++ b/compare-locales.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f42de85651016a67446293fe1e4087f220581446d79202070a45756a710bcad -size 28484 +oid sha256:81893c41ce9ef74232c64caf695ac685e4b26c40ae9c918cd175275c36ef4286 +size 28512 diff --git a/firefox-69.0.2.source.tar.xz b/firefox-69.0.2.source.tar.xz deleted file mode 100644 index 5f16622..0000000 --- a/firefox-69.0.2.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2904ef954626d2a7f320670ccb7cb5d9060610f091c94190a6cbee14aa2cd82e -size 315308244 diff --git a/firefox-69.0.2.source.tar.xz.asc b/firefox-69.0.2.source.tar.xz.asc deleted file mode 100644 index c95789a..0000000 --- a/firefox-69.0.2.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl2UzKEACgkQ8aZmj7t9 -Vy7uBQ//UYL6F2q8A3/R2xGPE0xwrCAUu56RkLtF/thDS7pxqUt9G9PAJyg+IDq1 -nsL1uD/pRngznQMUXVKJ+BKsmFUpiBrGv0aN440S07kiw3uXF52RiVNGAgz786kN -eECa3wHB/AmfeN8J3Xz5P9aI1L39mSKhxGqABbKOWFMnvjMoJdEMgrbY/4+jzBS2 -Hp68NSS+o2+iJ4JcGFgidHuBomqHQ2JEesn2pHzPriPxSKNrEkAw7w5K4UZezFd2 -Ereh3znfMNPapIFOy/95IdWyGn1POVPdtpyXOWiz3W8CGUlwMtRfqO2ki++XJJN8 -073wQHZRq1pcohZ+7CNRNGpuic5Hsid/d0O7B5Iu5TBGMQoCSA6LfZ18+x8GGaOV -2BbJxb6kmEFZ696YQa50elNx5QYJsEk6TVxQnbpmpTkxk6S2zguzvUkKbbKVoHnd -IZjgIQA9g8R47HwL/WsXJgosbyMERBDLLaNXpsuquCHsUYeH0wnfWcmpkm/o4Djy -DSx9Ag25C4y5Yg57E8+ggaz0cKzFpMYAcVX+2O9TU5JtfaWLklMf4u3oQVLtLiyC -s/S2ot9nrCo4F6QNCbbDaCFoeFKoZ7JdqVV0i32mER9+KEo14G1SOz9j1l7C4T4W -U3jsLeUAm47vt9hB7hiOsdma42b0Bijbni7D68SF+MKYnb1NCVo= -=FgGs ------END PGP SIGNATURE----- diff --git a/firefox-69.0.3.source.tar.xz b/firefox-69.0.3.source.tar.xz new file mode 100644 index 0000000..ed73339 --- /dev/null +++ b/firefox-69.0.3.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7527947a876c1734b8b2339f19b8ff8da6f4e4d06351b44940cb48d3509bb891 +size 315473484 diff --git a/firefox-69.0.3.source.tar.xz.asc b/firefox-69.0.3.source.tar.xz.asc new file mode 100644 index 0000000..ea504dd --- /dev/null +++ b/firefox-69.0.3.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl2eQUAACgkQ8aZmj7t9 +Vy5XgBAAm9m7Wkp015l0m5MJzC67DKC2aOonwY3lVKlmQX1yaEj+njDyDCWdy3Ey +ihiqsYq5u3B9lxvRKTc6IqiYYMX+RM3TstvW1POMo+L+MEKUVz1lXFZGcSSEYkH3 +4W7QXDkWsYKWc3Hc8yz8X+yCPY2z46xFshyiialhGGnpJDJFvw0MP/IOhk7DwiRt +c7xCtquIFaTZ4UWqu0FWviw35rxtRyY/Ztha0VZ7HoLU0TbI+J5ORQWKtx5gK0Hz +dgG5ecLtJbRt1KFaObXzCHE3jRFSxPCCiusrua6IPDcqH0ex6zvdsp7hz4E0rpVC +pmQAr6Bv6XrvwCgyiH94KIcT81+1fUnu1akwBQ5awQK+Jwj1L9i5unOPdV/FAexW +QBV35njb8Xww8o5jS/82wOs/J1huhJvKFq4UmE02dSq46mxezqVAqkAaww/yKj7a +sKeEQ+sheh+sWuTimCUOA6hPrdP53oWB9RZ2oADyy+qUlHj+LlhixZ58OSgBlmJq +DKbApih9Cqt90IBPq8SGdgcJ3kRPIdT9I3Qrr0MmXgWnGH3oLfv9eJXrEn6sPK1/ +qv7dxb2OYjAYbCNs5hoyfxEku6xMGeVoUbxv/Fp8Vz7CBxdb4M/HRoHHXHa8lZNP +uwbxVBypVCug/QWC2cbJ+x9s2Jj/Im3BzuA+M88gs/QLvVvYEyk= +=eGlk +-----END PGP SIGNATURE----- diff --git a/l10n-69.0.2.tar.xz b/l10n-69.0.2.tar.xz deleted file mode 100644 index 1d3ad63..0000000 --- a/l10n-69.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a65e010582c54eaf927343237dc42a156cf1f0f9e79509df246b3461b9eb3413 -size 49093672 diff --git a/l10n-69.0.3.tar.xz b/l10n-69.0.3.tar.xz new file mode 100644 index 0000000..2f4c246 --- /dev/null +++ b/l10n-69.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76d7e155448b74395e0d1a54aab67bb32e0c181c999302143ff086cfeba8179c +size 49109416 diff --git a/tar_stamps b/tar_stamps index 0c24d88..f7e1e23 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,8 +1,8 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="69.0.2" +VERSION="69.0.3" VERSION_SUFFIX="" -RELEASE_TAG="e40b66e55c283267a74ea411b9dfeeb7ddbb879c" +RELEASE_TAG="c4227f95dae9e613acd966b9999fda0565eafb9d" PREV_VERSION="" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation