rpms/bugzilla
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove bytecompilation macro and add upstream mail patch

Browse source 
Remove bytecompilation macro and add upstream mail patch
This commit is contained in:
Emmanuel Seyman 2020-09-29 20:30:16 +02:00
commit f1620ad7fc
2 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bugzilla-1855962-non-html-mail.patch Normal file
View file

@ -0,0 +1,19 @@
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 18795d735..2075a71e1 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -495,10 +495,10 @@ sub _generate_bugmail {
}
my $email = Bugzilla::MIME->new($msg_header);
- if (scalar(@parts) == 1) {
- $email->content_type_set($parts[0]->content_type);
- }
- else {
+
+ # If there's only one part, we don't need to set the overall content type
+ # because Email::MIME will automatically take it from that part (bug 1657496)
+ if (scalar(@parts) > 1) {
$email->content_type_set('multipart/alternative');
# Some mail clients need same encoding for each part, even empty ones.

13
bugzilla.spec
View file

@ -1,7 +1,3 @@
# This package depends on automagic byte compilation
# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
%global _python_bytecompile_extra 1
%define bzinstallprefix %{_datadir}
%define bzdatadir %{_sharedstatedir}/bugzilla
@ -9,7 +5,7 @@ Summary: Bug tracking system
URL: https://www.bugzilla.org/
Name: bugzilla
Version: 5.0.6
Release: 8%{?dist}
Release: 9%{?dist}
License: MPLv1.1
Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
Source1: bugzilla-httpd-conf
@ -18,6 +14,8 @@ Source3: bugzilla.cron-daily
Patch0: bugzilla-rw-paths.patch
Patch1: bugzilla-dnf.patch
Patch2: bugzilla-1438957-concatenate-assets.patch
# https://bug1657496.bmoattachments.org/attachment.cgi?id=9169528
Patch3: bugzilla-1855962-non-html-mail.patch
BuildArch: noarch
Requires: patchutils
@ -290,13 +288,16 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
%changelog
* Tue Sep 29 2020 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-9
- Remove automagic Python bytecompilation macro
- Include upstream patch for text mails (#1855962)
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-8
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 24 2020 Jitka Plesnikova <jplesnik@redhat.com> - 5.0.6-6
- Add all perl dependencies needed for build