From 38ca28006f8603786cc6f49deb9ff21fbc090d91c2b1de7c945e9b0b8b542e87 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 29 Jul 2023 12:27:50 +0000 Subject: [PATCH] Accepting request 1101319 from home:AndreasStieger:branches:mozilla:Factory 115.0.3 boo#1213657 boo#1213776 OBS-URL: https://build.opensuse.org/request/show/1101319 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=1077 --- MozillaFirefox.changes | 7 +++++++ MozillaFirefox.spec | 4 ++-- firefox-115.0.2.source.tar.xz | 3 --- firefox-115.0.2.source.tar.xz.asc | 16 ---------------- firefox-115.0.3.source.tar.xz | 3 +++ firefox-115.0.3.source.tar.xz.asc | 16 ++++++++++++++++ l10n-115.0.2.tar.xz => l10n-115.0.3.tar.xz | 0 mozilla.sh.in | 4 ++-- tar_stamps | 8 ++++---- 9 files changed, 34 insertions(+), 27 deletions(-) delete mode 100644 firefox-115.0.2.source.tar.xz delete mode 100644 firefox-115.0.2.source.tar.xz.asc create mode 100644 firefox-115.0.3.source.tar.xz create mode 100644 firefox-115.0.3.source.tar.xz.asc rename l10n-115.0.2.tar.xz => l10n-115.0.3.tar.xz (100%) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 4adf4cf..8438230 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 28 20:56:00 UTC 2023 - Andreas Stieger + +- Mozilla Firefox 115.0.3 + * fixes for other platforms +- remove bashisms from firefox startup script (boo#1213657) + ------------------------------------------------------------------- Thu Jul 13 13:30:20 UTC 2023 - Wolfgang Rosenauer diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index f97dde3..72d53d7 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -29,8 +29,8 @@ # major 69 # mainver %%major.99 %define major 115 -%define mainver %major.0.2 -%define orig_version 115.0.2 +%define mainver %major.0.3 +%define orig_version 115.0.3 %define orig_suffix %{nil} %define update_channel release %define branding 1 diff --git a/firefox-115.0.2.source.tar.xz b/firefox-115.0.2.source.tar.xz deleted file mode 100644 index 60b8c90..0000000 --- a/firefox-115.0.2.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b2844124c13b4bd9d97ac7f5840f3e957b7631659591f3bea1ac9a89bee1654 -size 506385780 diff --git a/firefox-115.0.2.source.tar.xz.asc b/firefox-115.0.2.source.tar.xz.asc deleted file mode 100644 index 69b9ea3..0000000 --- a/firefox-115.0.2.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmSsXdIACgkQ4207E/PZ -MnTfSA//VO2FMArDHPtJnOaUCWrrkhrq+1CtZAxmln+2iKtKTe2okY+jSzFbn1rK -qxEtIwU69qOqhAoXbcYa/3jMw1rOcZtbTOuJ60UUWwZhaxI9lCdrqIJfVXm1FitF -gT6MVV1gjgxfoTbTfLfpNUCIVbfuysnNlP6cjmqRCFLGrSwdcNC3zuSJzN33NYbn -V3W/Ix0Du7r98wjuSEnd7JO3MolwU1g0rYc0UzNxtavg5epOfKybiEMBWAQ+P/hh -zkJ1A85ockLZ2kTpXf2KzfzTVNGPB9FK7xYFQOJ08ab89Kr+nCUh1kMc5uebnme+ -Q52JOXnHHeU86bjbv7M51SBS2BILmQlUpEhGspmp3OKMWDICuTcg1EWULGGv2q5R -hzPpPCArPOC/Ox1MQyJwvn0ICIYYAOCWWLdTa+Iu/gtP8RI66AbWskf6AoanLRwF -d4FNl3l3aT9ZZK6rkFoAhUcAU/nyigvGNEJbUQ5dAr3ii7l9owdd+Jqgk7BOrYPT -OCrt8H1oDWm+TewPnKQsl3xLlbeWBREttHeAJs65zuqrPYjjw1wM9Vsrx+1p/O6C -flnbbcXyjC0B0F4uY8y90nWUh2lZZVkiT/pKgfcHiGZSiKg+nCeaiuq3s/zhNBQD -Cp/K4SYCjos/Lq1HErUXCmx7c/l02WwsCDUUSRAKz50A7VHfZYw= -=BMdH ------END PGP SIGNATURE----- diff --git a/firefox-115.0.3.source.tar.xz b/firefox-115.0.3.source.tar.xz new file mode 100644 index 0000000..a797b73 --- /dev/null +++ b/firefox-115.0.3.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a38c923375639b6a382111f5f6f6388f33a3f1dedff23061dd6b10b11994a90 +size 503556124 diff --git a/firefox-115.0.3.source.tar.xz.asc b/firefox-115.0.3.source.tar.xz.asc new file mode 100644 index 0000000..6fdb139 --- /dev/null +++ b/firefox-115.0.3.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmTBuYkACgkQ4207E/PZ +MnSgbw//QJnIbPkWcEW8pV/kXX8Rv158AkqaGSCrMKQ5YtBF1Ju+JVcq8/zN+Dx2 +8Zd0Z5r7FGuQflVKwt9zZIR4+ezRM525/NNnG4Mu22a8RC1/6OxFYtHrPvZDoQs/ +QTNZRI1LogH+fZVxWCfDaukpw558n6zb962OiYDAnxXUhTYjyTxrapUpYLXPFBQ+ +9Dv8FMzlY+Lhj8Qoo5917gd0okdOdDyE2VpFOM7aucZ3JBDnhYWI+UBV1C6QpE5y +5uS5ctmWgJobjQfH4OgPLW9DjdhSgVShvLnX5tym58kYBHUjBybUve+JdINT4Y8Q +TrmFv5RDyPjyIJSHrfmTT6ccm0tjwzj+rT0bzYqrQ1UDsPMsedBTJ12bAJfsre1g +PGAU58o1L179Yvz9/wQ8JOeAO5+KjPgjC/am9W9013Q5vE6GfoFTGV9E86rRjedx +g3uDXpiOuGs+eq/zCeT5aU4fJV4KE5t5JrgCUcYOoBto/FCKG7WzAYw3QWD1/wkT +lb7MahG6lJsUZtMsdvAOUsa56Gve/R2XFEKNmmCEGwEBvkZiUHNq4Pg4MuTRxSyu +KSzppczrxZX+vm5qoySlx2iceWl5p1oEOj3/Ok7+hZfB2xzx+QS8fZHf3xQomWqW +z8Cu0cd0upI7Fb331pvszWJNee4VpDVQTtNbHecyvz79xB87daQ= +=GmmK +-----END PGP SIGNATURE----- diff --git a/l10n-115.0.2.tar.xz b/l10n-115.0.3.tar.xz similarity index 100% rename from l10n-115.0.2.tar.xz rename to l10n-115.0.3.tar.xz diff --git a/mozilla.sh.in b/mozilla.sh.in index 9950473..e90f5eb 100644 --- a/mozilla.sh.in +++ b/mozilla.sh.in @@ -100,7 +100,7 @@ if [ "$WAYLAND_DISPLAY" ]; then fi # xinput2 (boo#1173320) -source /etc/os-release +. /etc/os-release if [ "$ID" = "opensuse-tumbleweed" ]; then export MOZ_USE_XINPUT2=1 fi @@ -151,7 +151,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then # Try with a local variant first, then without a local variant SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g" | sed "s|\..*||g"` MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g" | sed "s|\..*||g"` - function create_langpack_link() { + create_langpack_link() { local language=$* local langpack=langpack-${language}@firefox.mozilla.org.xpi if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then diff --git a/tar_stamps b/tar_stamps index b0f6ef2..8afbc07 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,10 +1,10 @@ PRODUCT="firefox" CHANNEL="release" -VERSION="115.0.2" +VERSION="115.0.3" VERSION_SUFFIX="" -PREV_VERSION="115.0.1" +PREV_VERSION="115.0.2" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/mozilla-release" -RELEASE_TAG="bd32951a19a6485f380f024a221b7fced7bd8c4a" -RELEASE_TIMESTAMP="20230710165010" +RELEASE_TAG="326212e7271a9c9f0776153095cf48d7153260aa" +RELEASE_TIMESTAMP="20230726201356"