diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 29590fa..3aa8631 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Dec 3 07:41:29 UTC 2024 - Wolfgang Rosenauer + +- Mozilla Thunderbird 128.5.1 + * Add end of year donation appeal + * Total message count for favorite folders did not work consistently + +------------------------------------------------------------------- +Thu Nov 28 09:07:50 UTC 2024 - Wolfgang Rosenauer + +- make spec compatible with rpm < 4.17 again +- correct appdata for different desktop filename + ------------------------------------------------------------------- Tue Nov 26 10:15:25 UTC 2024 - Wolfgang Rosenauer diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 824c80b..3cdc2a6 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -25,14 +25,13 @@ # FF70beta3 would be released as FF69.99 # orig_version would be the upstream tar ball # orig_version 70.0 -# orig_suffix b3 +# orig_suffix b3 (or esr) # major 69 # mainver %%major.99 %define major 128 -%define mainver %major.5.0 -%define orig_version 128.5.0 -%define esr_suffix esr -%define orig_suffix %{nil} +%define mainver %major.5.1 +%define orig_version 128.5.1 +%define orig_suffix esr %define update_channel esr %define source_prefix thunderbird-%{orig_version} @@ -70,8 +69,8 @@ BuildArch: i686 %define appname Thunderbird %define progdir %{_prefix}/%_lib/%{progname} %define gnome_dir %{_prefix} -#%define desktop_file_name %{progname} -%define desktop_file_name %["%esr_suffix" == "esr" ? "%{progname}-esr" : "%{progname}"] +%{!?orig_suffix:%global orig_suffix ""} +%define desktop_file_name %(echo "%{orig_suffix}" | grep -q esr && echo "%{progname}-esr" || echo "%{progname}") %define __provides_exclude ^lib.*\\.so.*$ %define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*|libgk.*|libldap.*|libldif.*|libprldap.*|librnp.*)$ %define localize 1 @@ -180,20 +179,20 @@ License: MPL-2.0 Group: Productivity/Networking/Email/Clients URL: https://www.thunderbird.net/ %if !%{with only_print_mozconfig} -Source: http://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}%{esr_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}%{esr_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: thunderbird.desktop Source2: thunderbird-rpmlintrc Source3: mozilla.sh.in Source4: tar_stamps Source6: suse-default-prefs.js %if %{localize} -Source7: l10n-%{orig_version}%{orig_suffix}%{esr_suffix}.tar.xz +Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz %endif Source9: thunderbird.appdata.xml Source13: spellcheck.js Source14: https://github.com/openSUSE/firefox-scripts/raw/913fab1a196e2a0623b5c554598bfde3b4b49e29/create-tar.sh -Source20: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}%{esr_suffix}/source/%{srcname}-%{orig_version}%{orig_suffix}%{esr_suffix}.source.tar.xz.asc -Source21: https://ftp.mozilla.org/pub/%{srcname}/releases/%{version}%{orig_suffix}%{esr_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 Patch3: mozilla-ntlm-full-path.patch @@ -548,7 +547,8 @@ install -m 644 %{SOURCE1} \ # cp %{SOURCE8} %{buildroot}%{_datadir}/mime/packages/%{progname}.xml # appdata mkdir -p %{buildroot}%{_datadir}/appdata -cp %{SOURCE9} %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml +sed -e 's,thunderbird.desktop,%{desktop_file_name}.desktop,g' \ + %{SOURCE9} > %{buildroot}%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # apply SUSE defaults sed -e 's,RPM_VERSION,%{mainversion},g s,GSSAPI,%{libgssapi},g' \ diff --git a/l10n-128.5.0esr.tar.xz b/l10n-128.5.1esr.tar.xz similarity index 100% rename from l10n-128.5.0esr.tar.xz rename to l10n-128.5.1esr.tar.xz diff --git a/tar_stamps b/tar_stamps index 99fa159..9d37df8 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,10 +1,10 @@ PRODUCT="thunderbird" CHANNEL="esr128" -VERSION="128.5.0" +VERSION="128.5.1" VERSION_SUFFIX="esr" -REV_VERSION="128.4.4" +REV_VERSION="128.5.0" PREV_VERSION_SUFFIX="esr" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr128" -RELEASE_TAG="5aa787475f1ff704f48d561dd2ba209b092f8336" -RELEASE_TIMESTAMP="20241125170630" +RELEASE_TAG="83b78f924766fceda5ec1d187e10677b5b2e2e73" +RELEASE_TIMESTAMP="20241202160748" diff --git a/thunderbird-128.5.0esr.source.tar.xz b/thunderbird-128.5.0esr.source.tar.xz deleted file mode 100644 index 20e2ab9..0000000 --- a/thunderbird-128.5.0esr.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e92ef24c1da888853d78d926c56599d1e0c7ad67a404d10dfea9483124e731cd -size 677426000 diff --git a/thunderbird-128.5.0esr.source.tar.xz.asc b/thunderbird-128.5.0esr.source.tar.xz.asc deleted file mode 100644 index 5e2fbc4..0000000 --- a/thunderbird-128.5.0esr.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmdE3WoACgkQ4207E/PZ -MnTOtBAArzDhhzvgO1pf31tzSu0HXZq01mCMjadDl4CZR4pVWbDvwnNf34y19MQ5 -68TcR5Fj03xnrJC2x+MfJVW36Ry2T1B6oUmxJznPom9HrTa22E9wvdgZu9rQhtLN -SIQVTndqAXZeNxkLoY2lqtx25pHmPh8JqiaiA0Mg2Uws2xHmCZrdU9ZqZm76gF/J -IqaSdK3ZcfV3FPbTEBhg67JYchqwepXwlyrl2lg7uLAaQyNGwFVTzGn+U9VGp3xw -BYTJLebnJc/H0I9r6O+9Pnqj2o2GlhEKVKabhO9/dzoa1keFKjaPHLkStioHXc8f -in2aoEqH3cgIkKLNxmpCpcO5RVelDSFE5xQxiB8MGQTRyLGtMNFHzXvCEFZVF3Hx -HJ1vxEuwaEhbHTDjGNpjy57y25BJnJR0JFxxUlZ4upSymqp8iW1JhQhQAFMJoDUn -EvMRMntD+9EUjbD2Cp/OO7dddACi1a50HLP4OlHU5pGEyNShIHoBJdo1Q0VHeg/7 -bXumwStRiWob/RoFAFFxjcxmxeyX9L/qynPh718PLdmXrzk7Xldwf9nCd222UE1/ -Zet9iXZOwhQSGziwu0JOzy4PJhFWZrVkpNLwL69Kpk6Lfz/9PnLM+oxa83Jep7Ic -Bi6lVFGx2MCRlophhRpDaT72pfkcsYfXkAPgUzWM4yDQS6E/LrQ= -=ebtR ------END PGP SIGNATURE----- diff --git a/thunderbird-128.5.1esr.source.tar.xz b/thunderbird-128.5.1esr.source.tar.xz new file mode 100644 index 0000000..cc57f68 --- /dev/null +++ b/thunderbird-128.5.1esr.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:035fb708f98cf4c90a193a1b3c8a381613ae4001af8c5a62a876d469c097bb5b +size 678670780 diff --git a/thunderbird-128.5.1esr.source.tar.xz.asc b/thunderbird-128.5.1esr.source.tar.xz.asc new file mode 100644 index 0000000..c610bb5 --- /dev/null +++ b/thunderbird-128.5.1esr.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEErdcHlHlwDcrf3VM34207E/PZMnQFAmdOCLkACgkQ4207E/PZ +MnT21xAAjC9a3QrufXUe43PondZ7rD/HZqHy701dHwQFycsfb63SpYZbYbl+6RKd +0mlfnwShNEL/tBVl6Y7ls/Y8bCfRenwJiGbHOQ1ZYeVIaIHHgUhts0gusLf/sWvF +2OE5PsKULNTfg88stZK681ff0+eHCy7F3dB0hkGn/G1jb7haYoZDd3CZ8P3rBYP9 +nJ6IJyAwf3vmH0eym/2QnJLqU9tGgyM5hcYDD5WQzrH3GPM9ZzxkI0ZSECjlF2Sw +V5OnHI0Qd2ONcuF6e1PD93h2g8L8nke7WdnGeTj4yUBXUyWPqRaGyU/nDgvL+A7n +rrbaMdzMA98DdX7o3FzL8CyvSByEmNF/iKCEkR3Y9+i4KmbYvoi5F+ehjUuus6xq ++LY1egWJZ0gULRuPIKRp6fY9yAQ9aFig76oKxRrNfyrrZwa8CB3LP156PP5g50ey +zGGyYwZzszGD0iPKzVOOsFMtuy3R3W7W+Zw27xnKcKQkU2uLcRCZOFbcaeHD9Php +6tFIWR6QkDM5ghjM43vx+xAwyp8jKVDlJs/FpcP5Dn75aQPRj8URq0BVmB2QrTuY +1yyRSCs9J6yk7i7nlORIQ0weBybw3ZE5nix2lpuAFqOxeajrL2EwmSwZ4+20Dkch +s3Bqd4CqgVRcDtE77G4u+UtqZdbX2CVx0OFmnQdBxjdO4VJZGAQ= +=8TqA +-----END PGP SIGNATURE-----