Compare commits

...

71 Commits
c8 ... a8-plus

Author SHA1 Message Date
eabdullin 33113d8910 Merge branch 'a8' into a8-plus 2024-01-31 10:11:06 +03:00
eabdullin cf6a17a435 Merge branch 'c8' into a8 2024-01-31 10:09:17 +03:00
eabdullin e26aaf089b Merge branch 'c8' into a8 2024-01-04 10:30:08 +03:00
eabdullin c528614c3d Merge branch 'a8' into a8-plus 2024-01-04 10:25:59 +03:00
eabdullin 229fe256c4 Merge branch 'c8' into a8 2024-01-04 10:24:54 +03:00
eabdullin 1ba7f7a2ec Merge branch 'a8' into a8-plus 2023-11-29 12:48:04 +04:00
eabdullin b22276289f Merge branch 'c8' into a8 2023-11-29 12:46:23 +04:00
eabdullin af357809f8 Merge branch 'a8' into a8-plus 2023-11-29 12:42:27 +04:00
eabdullin eee1da594f Merge branch 'c8' into a8 2023-11-29 12:37:18 +04:00
eabdullin 6b931a6c87 Merge branch 'a8' into a8-plus 2023-11-02 11:56:21 +03:00
eabdullin 7381f37a2d Merge branch 'c8' into a8 2023-11-02 11:55:10 +03:00
eabdullin c675fda867 Merge branch 'a8' into a8-plus 2023-10-05 18:33:59 +03:00
eabdullin a09d59330f Merge branch 'c8' into a8 2023-10-05 18:31:52 +03:00
eabdullin 61f77b0ad2 Merge branch 'a8' into a8-plus 2023-09-20 12:06:30 +03:00
eabdullin 6401601ae8 Merge branch 'c8' into a8 2023-09-20 12:06:28 +03:00
eabdullin 69aaa67e04 Merge branch 'a8' into a8-plus 2023-09-05 22:36:01 +03:00
eabdullin 09cfae812e Merge branch 'c8' into a8 2023-09-05 22:35:53 +03:00
eabdullin 971b3cb5ea Fix release version 2023-07-14 11:19:01 +03:00
eabdullin e049a76e53 Merge branch 'a8' into a8-plus 2023-07-14 11:15:48 +03:00
eabdullin 799fdb58dc Merge branch 'c8' into a8 2023-07-14 11:15:29 +03:00
eabdullin 971c3b597a Merge branch 'a8' into a8-plus 2023-05-18 06:16:15 +00:00
eabdullin 391b0a0502 Merge branch 'c8' into a8 2023-05-18 06:16:10 +00:00
eabdullin 8d3adf2aff Merge branch 'a8' into a8-plus 2023-04-17 13:44:50 +00:00
eabdullin 04471a5a94 Merge branch 'c8' into a8 2023-04-17 13:44:46 +00:00
eabdullin 06f2457015 Merge branch 'a8' into a8-plus 2023-03-22 10:19:11 +00:00
eabdullin 0d18902bd6 Merge branch 'c8' into a8 2023-03-22 10:19:07 +00:00
eabdullin 5a979440af Merge branch 'a8' into a8-plus 2023-02-20 11:54:59 +00:00
eabdullin 69bed650cb Merge branch 'c8' into a8 2023-02-20 11:54:55 +00:00
eabdullin 6681b968c3 Merge branch 'a8' into a8-plus 2023-02-07 09:39:58 +00:00
eabdullin f8fa686d87 Merge branch 'c8' into a8 2023-02-07 09:39:54 +00:00
eabdullin 386ce39a84 Fix changelog 2023-01-25 19:25:56 +03:00
eabdullin 20ec8b1733 Merge branch 'a8' into a8-plus 2023-01-25 19:13:54 +03:00
eabdullin 8dd47b353f Merge branch 'c8' into a8 2023-01-25 15:10:06 +00:00
eabdullin 4eb7684462 Merge branch 'a8' into a8-plus 2022-12-15 22:08:27 +03:00
eabdullin 099aae8130 Merge branch 'c8' into a8 2022-12-15 15:46:24 +00:00
Andrew Lukoshko 42e1f1baeb Add mising .plus 2022-11-21 19:31:06 +01:00
Andrew Lukoshko 687aafd2e6 Merge branch 'c8' into a8-plus 2022-11-21 12:28:32 +01:00
eabdullin e4072b404c Merge branch 'c8' into a8 2022-11-21 11:18:37 +00:00
Andrew Lukoshko b1f19d5ea2 Do not apply OpenPGP disable patch 2022-11-20 13:06:40 +01:00
eabdullin 846be71ef1 Add record to changelog 2022-11-01 11:42:39 +03:00
eabdullin 68e3bad7d8 AlmaLinux changes 2022-10-25 18:35:57 +03:00
eabdullin 268e5015ee Merge branch 'a8' into a8-plus 2022-10-25 15:31:20 +00:00
eabdullin 36135359ad Merge branch 'c8' into a8 2022-10-25 15:31:14 +00:00
eabdullin 12263960ff Fix changelog 2022-10-18 21:42:04 +03:00
eabdullin 82e710680f Merge branch 'a8' into a8-plus 2022-10-18 18:40:36 +00:00
eabdullin ceb7317b05 Merge branch 'c8' into a8 2022-10-18 18:40:29 +00:00
Andrew Lukoshko a184e57b70 Add librnp-rnp subpackage 2022-10-03 10:05:47 +00:00
Andrew Lukoshko c5aa5e6997 Merge branch 'c8' into a8-plus 2022-10-02 19:42:37 +00:00
Andrew Lukoshko 11bc7793c3 Merge branch 'c8' into a8 2022-09-26 20:50:03 +00:00
eabdullin 3a2f4b3437 Fix date in changelog 2022-08-24 20:48:59 +03:00
eabdullin ba65851447 Merge branch 'c8' into a8-plus 2022-08-24 20:46:25 +03:00
eabdullin 89a0fd84b6 Merge branch 'c8' into a8 2022-08-24 17:25:05 +00:00
Andrew Lukoshko 7cdcb34e3f Merge remote-tracking branch 'origin/c8' into a8-plus 2022-08-02 12:45:34 +00:00
eabdullin 82338a9b08 Merge branch 'c8' into a8 2022-08-01 08:58:38 +00:00
eabdullin c5066ecf37 Fix changelog 2022-07-01 08:40:46 +03:00
eabdullin f5ea9bae5c Merge branch 'c8' into a8-plus 2022-07-01 08:37:03 +03:00
eabdullin 175f3993d6 Merge branch 'c8' into a8 2022-06-30 23:24:36 +00:00
Andrew Lukoshko f9ee0e2f0c Merge branch 'a8' into a8-plus 2022-06-02 13:12:18 +00:00
eabdullin 790e38ac28 Added changelog line 2022-06-02 11:14:35 +03:00
eabdullin fec3b15ca2 Merge branch 'c8' into a8 2022-06-02 07:51:17 +00:00
Andrew Lukoshko 03f1ced1d2 Plus changes 2022-05-26 22:43:46 +00:00
eabdullin cb78322c6c Merge branch 'c8' into a8 2022-05-26 11:05:42 +00:00
eabdullin 1aa5f0151b Merge branch 'c8' into a8 2022-05-05 13:34:11 +00:00
eabdullin feac4976db Merge branch 'c8' into a8 2022-04-11 13:32:16 +00:00
eabdullin 387469dbb0 Merge branch 'c8' into a8 2022-03-14 13:44:10 +00:00
eabdullin a6bd4d84fa Merge branch 'c8' into a8 2022-02-15 10:05:59 +00:00
eabdullin 62b23618ff Merge branch 'c8' into a8 2022-01-12 11:32:10 +00:00
eabdullin 66c23a0f50 Almalinux changes 2021-12-23 13:34:59 +03:00
eabdullin b3f8354f54 AlmaLinux changes 2021-11-17 16:47:26 +03:00
Andrew Lukoshko 4d1f9f8163 Merge remote-tracking branch 'origin/c8' into a8 2021-10-21 15:41:10 +00:00
Andrew Lukoshko f17f852148 AlmaLinux changes 2021-09-15 12:24:48 +00:00
2 changed files with 27 additions and 13 deletions

View File

@ -2,7 +2,7 @@ pref("app.update.enabled", false);
pref("app.update.autoInstallEnabled", false);
/* Allow users to set custom colors*/
/* pref("browser.display.use_system_colors", true);*/
pref("general.useragent.vendor", "Red Hat");
pref("general.useragent.vendor", "AlmaLinux");
pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
pref("intl.locale.matchOS", true);
pref("mail.shell.checkDefaultClient", false);

View File

@ -135,7 +135,7 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 115.7.0
Release: 1%{?dist}
Release: 1%{?dist}.alma.plus
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -291,6 +291,8 @@ BuildRequires: rustfmt >= %{rust_version}
BuildRequires: rust >= %{rust_version}
%endif
Requires: thunderbird-librnp%{?_isa}
%if 0%{?rhel} == 9
BuildRequires: cargo
BuildRequires: clang clang-libs llvm llvm-devel
@ -893,6 +895,20 @@ Provides: bundled(crate(zeitstempel)) = 0.1.1
%description
Mozilla Thunderbird is a standalone mail and newsgroup client.
%package librnp-rnp
Summary: OpenPGP implementation for Thunderbird based on RNP
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: thunderbird-librnp
Provides: thunderbird-librnp%{?_isa}
Conflicts: thunderbird-librnp%{?_isa}
%description librnp-rnp
The thunderbird-librnp-rnp package contains an OpenPGP implementation
based on RNP.
%files librnp-rnp
%{mozappdir}/librnp.so
%{mozappdir}/rnp-cli
%{mozappdir}/rnpkeys
%prep
echo "Build environment"
echo "--------------------------------------------"
@ -1410,9 +1426,9 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/compreg.dat
touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
# Removing librnp.so - we cannot deliver librnp with botan crypto backend RHELs
%if !%{?use_openssl_for_librnp}
%{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
%endif
# %if !%{?use_openssl_for_librnp}
# %{__rm} -rf %{buildroot}%{mozappdir}/librnp.so %{buildroot}%{mozappdir}/rnp-cli %{buildroot}%{mozappdir}/rnpkeys
# %endif
# Register as an application to be visible in the software center
mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
@ -1514,6 +1530,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Wed Jan 31 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.7.0-1.alma.plus
- Enable openpgp
* Wed Jan 31 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.7.0-1.alma.1
- Debrand for AlmaLinux
* Mon Jan 22 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
- Update to 115.7.0 build1
@ -1546,7 +1568,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
- Update to 102.11.0 build1
* Tue Apr 11 2023 Eike Rathke <erack@redhat.com> - 102.10.0-2
- Update to 102.10.0 build2
@ -1555,25 +1576,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Mon Mar 13 2023 Eike Rathke <erack@redhat.com> - 102.9.0-2
- Update to 102.9.0 build1
* Wed Feb 15 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
- Update to 102.8.0 build2
* Fri Feb 10 2023 Eike Rathke <erack@redhat.com> - 102.8.0-1
- Update to 102.8.0 build1
* Tue Jan 31 2023 Eike Rathke <erack@redhat.com> - 102.7.1-2
- Update to 102.7.1 build2
* Tue Jan 24 2023 Eike Rathke <erack@redhat.com> - 102.7.1-1
- Update to 102.7.1 build1
* Mon Jan 16 2023 Eike Rathke <erack@redhat.com> - 102.7.0-1
- Update to 102.7.0 build1
* Tue Dec 13 2022 Eike Rathke <erack@redhat.com> - 102.6.0-2
- Update to 102.6.0 build2
* Fri Dec 09 2022 Eike Rathke <erack@redhat.com> - 102.6.0-1
- Update to 102.6.0 build1
@ -1582,13 +1598,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Nov 15 2022 Eike Rathke <erack@redhat.com> - 102.5.0-2
- Update to 102.5.0 build2
* Fri Nov 11 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
- Update to 102.5.0 build1
* Mon Oct 17 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
- Update to 102.4.0 build1
* Wed Oct 12 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-4
- Fix for expat CVE-2022-40674