From 8378b3a728943c99488ffde1a0b3a875f7ad4ed4 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 02:08:31 +0000
Subject: [PATCH 01/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index c6377c5..8b75e30 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 4.4.8
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -226,6 +226,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Sat Jan 31 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.8-1
 - Update to 4.4.8 (fixes regressions in 4.4.7 which itself
   fixed security flaws) (CVE-2014-1571, CVE-2014-8630)

From 514ce27a8bce37317b54b4288e0149964e040171 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 13 Sep 2015 17:24:00 +0200
Subject: [PATCH 02/51] Update to 4.4.10

---
 .gitignore    |  1 +
 bugzilla.spec | 11 +++++++++--
 sources       |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d638e66..b874aa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.4.5.tar.gz
 /bugzilla-4.4.6.tar.gz
 /bugzilla-4.4.8.tar.gz
+/bugzilla-4.4.10.tar.gz
diff --git a/bugzilla.spec b/bugzilla.spec
index 8b75e30..029f517 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 4.4.8
+Version: 4.4.10
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -147,6 +147,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla
 install -m 0644 -D -p %{SOURCE1}  ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf
 install -m 0755 -D -p %{SOURCE3}  ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily
+rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE
 
 %post
 (pushd %{bzinstallprefix}/bugzilla > /dev/null
@@ -159,6 +160,7 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/*.pl
 %{bzinstallprefix}/bugzilla/Bugzilla.pm
 %{bzinstallprefix}/bugzilla/robots.txt
+%{bzinstallprefix}/bugzilla/taskgraph.json
 %{bzinstallprefix}/bugzilla/Bugzilla
 %{bzinstallprefix}/bugzilla/extensions
 %{bzinstallprefix}/bugzilla/images
@@ -175,6 +177,7 @@ popd > /dev/null)
 %defattr(-,root,root,-)
 %doc README
 %doc README.fedora
+%license LICENSE
 %dir %{bzdatadir}
 %defattr(0750,root,apache,-)
 %dir %{_sysconfdir}/bugzilla
@@ -226,6 +229,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Sep 13 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.10-1
+- Update to 4.4.10
+- Use %%license to flag the LICENSE file
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index b0f7553..a849a30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86aed922fc99aee0498f864f18d9be96  bugzilla-4.4.8.tar.gz
+c0490b7461a0d6520d118c720e1c3f37  bugzilla-4.4.10.tar.gz

From 5ccadfbfa74a3400d3fc92a335f9c1e54ad6694f Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Wed, 23 Dec 2015 16:21:10 +0100
Subject: [PATCH 03/51] Update to 4.4.11

---
 .gitignore    | 1 +
 bugzilla.spec | 5 ++++-
 sources       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b874aa5..ec294de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.4.6.tar.gz
 /bugzilla-4.4.8.tar.gz
 /bugzilla-4.4.10.tar.gz
+/bugzilla-4.4.11.tar.gz
diff --git a/bugzilla.spec b/bugzilla.spec
index 029f517..0ad0156 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 4.4.10
+Version: 4.4.11
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -229,6 +229,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Dec 23 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.11-1
+- Update to 4.4.11
+
 * Sun Sep 13 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.10-1
 - Update to 4.4.10
 - Use %%license to flag the LICENSE file
diff --git a/sources b/sources
index a849a30..17f0e7a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0490b7461a0d6520d118c720e1c3f37  bugzilla-4.4.10.tar.gz
+d3380aba9b4f4b606a804b00f1a56bf1  bugzilla-4.4.11.tar.gz

From fbfe368dc1f3440fa87450876beb540699064930 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sat, 16 Jan 2016 18:24:29 +0100
Subject: [PATCH 04/51] Update to 5.0.2

---
 .gitignore                               |   1 +
 README.fedora.bugzilla                   |   2 +-
 bugzilla-yum.patch => bugzilla-dnf.patch |   6 +-
 bugzilla-rw-paths.patch                  |  37 +++---
 bugzilla.spec                            | 140 ++++++++++++++---------
 sources                                  |   2 +-
 6 files changed, 115 insertions(+), 73 deletions(-)
 rename bugzilla-yum.patch => bugzilla-dnf.patch (90%)

diff --git a/.gitignore b/.gitignore
index ec294de..3d873aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.4.8.tar.gz
 /bugzilla-4.4.10.tar.gz
 /bugzilla-4.4.11.tar.gz
+/bugzilla-5.0.2.tar.gz
diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla
index 4663885..20725f7 100644
--- a/README.fedora.bugzilla
+++ b/README.fedora.bugzilla
@@ -9,7 +9,7 @@ the values in this file are accurate for your environment.
 
 Once this is done, you may need to modify default settings for your database
 to ensure it accepts Bugzilla data properly.  Please see 
-http://www.bugzilla.org/docs/4.0/en/html/configuration.html for specifics of 
+https://bugzilla.readthedocs.org/en/5.0/ for specifics of
 database setting modifications.
 
 Lastly, simply re-run checksetup.pl to populate the database tables, set up
diff --git a/bugzilla-yum.patch b/bugzilla-dnf.patch
similarity index 90%
rename from bugzilla-yum.patch
rename to bugzilla-dnf.patch
index 9d53205..78c1d18 100644
--- a/bugzilla-yum.patch
+++ b/bugzilla-dnf.patch
@@ -1,6 +1,6 @@
 --- bugzilla-4.01/Bugzilla/Install/Requirements.pm	2011-05-01 17:09:35.000000000 +0200
 +++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm	2011-05-01 17:11:28.000000000 +0200
-@@ -587,7 +587,7 @@
+@@ -648,7 +648,7 @@
      if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
          && !$check_results->{hide_all}) 
      {
@@ -9,12 +9,12 @@
      }
      if (!$check_results->{pass}) {
          print colored(install_string('installation_failed'), COLOR_ERROR),
-@@ -732,7 +732,7 @@
+@@ -797,7 +797,7 @@
          $package = $module->{package};
      }
      else {
 -        $command = "$^X install-module.pl \%s";
-+        $command = "yum install \"perl(\%s)\"";
++        $command = "dnf install \"perl(\%s)\"";
          # Non-Windows installations need to use module names, because
          # CPAN doesn't understand package names.
          $package = $module->{module};
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
index 1bad35c..3f60dea 100644
--- a/bugzilla-rw-paths.patch
+++ b/bugzilla-rw-paths.patch
@@ -1,30 +1,35 @@
-diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm
---- ./Bugzilla/Constants.pm.orig	2013-09-02 22:51:11.831245853 +0200
-+++ ./Bugzilla/Constants.pm	2013-09-02 22:53:27.733416972 +0200
-@@ -627,20 +627,20 @@ sub bz_locations {
-         # make sure this still points to the CGIs.
-         'cgi_path'    => $libpath,
+diff -up bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths bugzilla-5.0.1/Bugzilla/Constants.pm
+--- bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths	2015-09-10 21:36:29.000000000 +0300
++++ bugzilla-5.0.1/Bugzilla/Constants.pm	2015-09-28 19:20:45.347013271 +0300
+@@ -670,7 +670,7 @@ sub _bz_locations {
+         $datadir = "data";
+     }
+ 
+-    $datadir = "$libpath/$datadir";
++    $datadir = "/var/lib/bugzilla/$datadir";
+     # We have to return absolute paths for mod_perl. 
+     # That means that if you modify these paths, they must be absolute paths.
+     return {
+@@ -682,11 +682,11 @@ sub _bz_locations {
          'templatedir' => "$libpath/template",
--        'template_cache' => "$datadir/template",
-+        'template_cache' => "/var/lib/bugzilla/$datadir/template",
+         'template_cache' => "$datadir/template",
          'project'     => $project,
 -        'localconfig' => "$libpath/$localconfig",
--        'datadir'     => $datadir,
--        'attachdir'   => "$datadir/attachments",
 +        'localconfig' => "/etc/bugzilla/$localconfig",
-+        'datadir'     => "/var/lib/bugzilla/$datadir",
-+        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
+         'datadir'     => $datadir,
+         'attachdir'   => "$datadir/attachments",
          'skinsdir'    => "$libpath/skins",
 -        'graphsdir'   => "$libpath/graphs",
 +        'graphsdir'   => "/var/lib/bugzilla/graphs",
          # $webdotdir must be in the web server's tree somewhere. Even if you use a 
          # local dot, we output images to there. Also, if $webdotdir is 
          # not relative to the bugzilla root directory, you'll need to 
-         # change showdependencygraph.cgi to set image_url to the correct 
-         # location.
+@@ -695,7 +695,7 @@ sub _bz_locations {
          # The script should really generate these graphs directly...
--        'webdotdir'   => "$datadir/webdot",
-+        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
+         'webdotdir'   => "$datadir/webdot",
          'extensionsdir' => "$libpath/extensions",
+-        'assetsdir'   => "$datadir/assets",
++        'assetsdir'   => "$libpath/assets",
      };
  }
+ 
diff --git a/bugzilla.spec b/bugzilla.spec
index 0ad0156..396ab7a 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -1,35 +1,53 @@
 %define bzinstallprefix %{_datadir}
-%define bzdatadir %{_localstatedir}/lib/bugzilla
+%define bzdatadir %{_sharedstatedir}/bugzilla
 
 Summary: Bug tracking system
-URL: http://www.bugzilla.org/
+URL: https://www.bugzilla.org/
 Name: bugzilla
-Version: 4.4.11
+Version: 5.0.2
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
-Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
+Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
-Patch1: bugzilla-yum.patch
+Patch1: bugzilla-dnf.patch
 
 BuildArch: noarch
-Requires: webserver, patchutils, perl(SOAP::Lite), which
+Requires: patchutils
 Requires: perl(CGI) >= 3.51
 Requires: perl(Digest::SHA)
-Requires: perl(Date::Format) >= 2.21
-Requires: perl(DateTime) >= 0.28
-Requires: perl(DateTime::TimeZone) >= 0.71
+Requires: perl(Date::Format) >= 2.23
+Requires: perl(DateTime) >= 0.75
+Requires: perl(DateTime::TimeZone) >= 1.64
 Requires: perl(DBI) >= 1.614
-Requires: perl(Template) >= 2.22
-Requires: perl(Email::Send) >= 2.00
+Requires: perl(Template) >= 2.24
+Requires: perl(Email::Sender) >= 1.300011
 Requires: perl(Email::MIME) >= 1.904
-Requires: perl(URI) >= 1.37
-Requires: perl(List::MoreUtils) >= 0.22
+Requires: perl(URI) >= 1.55
+Requires: perl(List::MoreUtils) >= 0.32
 Requires: perl(Math::Random::ISAAC) >= 1.0.1
+Requires: perl(File::Slurp) >= 9999.13
+Requires: perl(JSON::XS) >= 2.01
 Requires: perl(Locale::Language)
+Requires: webserver
+Requires: which
+# for building docs
+BuildRequires: perl(File::Copy::Recursive)
+BuildRequires: perl(File::Which)
+BuildRequires: perl(Memoize)
+BuildRequires: python-sphinx
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-collection-latexrecommended
+BuildRequires: texlive-collection-basic
+BuildRequires: texlive-upquote
+BuildRequires: tex-framed
+BuildRequires: tex-multirow
+BuildRequires: tex-threeparttable
+BuildRequires: tex-titlesec
+BuildRequires: tex-wrapfig
 
 %package doc
 Summary: Bugzilla documentation
@@ -103,9 +121,15 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+if [ -f Bugzilla/Constants.pm.orig ]; then
+    : ERROR: Patch0 did not apply cleanly
+    exit 1
+fi
 %patch1 -p1
-rm -f Bugzilla/Constants.pm.orig
-rm -f Bugzilla/Install/Requirements.pm.orig
+if [ -f Bugzilla/Install/Requirements.pm.orig ]; then
+    : ERROR: Patch1 did not apply cleanly
+    exit 1
+fi
 # Remove bundled libs
 rm -rf lib/CGI*
 # Remove bundled binary files
@@ -118,8 +142,8 @@ grep -rl '/usr/lib/sendmail\b' contrib docs \
 | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
 
 %build
-find . -depth -name CVS -type d -exec rm -rf {} \;
-find . -depth -name .cvsignore -type f -exec rm -rf {} \;
+# Build docs
+docs/makedocs.pl --with-pdf
 # Remove the execute bit from files that don't start with #!
 for file in `find -type f -perm /111`; do
   if head -1 $file | grep -E -v '^\#!' &>/dev/null; then
@@ -133,21 +157,23 @@ for file in `find -type f -perm /664`; do
   fi
 done
 
-
 %install
-mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
+mkdir -p %{buildroot}%{bzinstallprefix}/bugzilla
 # these files are only used for testing Bugzilla code
 # see https://bugzilla.mozilla.org/show_bug.cgi?id=995209
 rm Build.PL MANIFEST.SKIP
-cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
-echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
-rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,UPGRADING,UPGRADING-pre-2.8}
+cp -pr * %{buildroot}%{bzinstallprefix}/bugzilla
+echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > %{buildroot}%{bzinstallprefix}/bugzilla/cron.whine
+rm -f %{buildroot}%{bzinstallprefix}/bugzilla/README \
+    %{buildroot}%{bzinstallprefix}/bugzilla/docs/TODO \
+    %{buildroot}%{bzinstallprefix}/bugzilla/docs/en/Makefile \
+    %{buildroot}%{bzinstallprefix}/bugzilla/docs/en/make.bat
 cp %{SOURCE2} ./README.fedora
-mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla
-install -m 0644 -D -p %{SOURCE1}  ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf
-install -m 0755 -D -p %{SOURCE3}  ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily
-rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE
+mkdir -p %{buildroot}%{bzdatadir}/assets
+mkdir -p %{buildroot}%{_sysconfdir}/bugzilla
+install -m 0644 -D -p %{SOURCE1}  %{buildroot}%{_sysconfdir}/httpd/conf.d/bugzilla.conf
+install -m 0755 -D -p %{SOURCE3}  %{buildroot}%{bzinstallprefix}/bugzilla/cron.daily
+ln -s ../../..%{bzdatadir}/assets %{buildroot}%{bzinstallprefix}/bugzilla/assets
 
 %post
 (pushd %{bzinstallprefix}/bugzilla > /dev/null
@@ -155,12 +181,14 @@ rm ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/LICENSE
 popd > /dev/null)
 
 %files
+%defattr(-,root,apache,-)
 %dir %{bzinstallprefix}/bugzilla
+%{bzinstallprefix}/bugzilla/LICENSE
 %{bzinstallprefix}/bugzilla/*.cgi
+%{bzinstallprefix}/bugzilla/*.json
 %{bzinstallprefix}/bugzilla/*.pl
 %{bzinstallprefix}/bugzilla/Bugzilla.pm
 %{bzinstallprefix}/bugzilla/robots.txt
-%{bzinstallprefix}/bugzilla/taskgraph.json
 %{bzinstallprefix}/bugzilla/Bugzilla
 %{bzinstallprefix}/bugzilla/extensions
 %{bzinstallprefix}/bugzilla/images
@@ -173,40 +201,32 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/cron.daily
 %{bzinstallprefix}/bugzilla/cron.whine
 %{bzinstallprefix}/bugzilla/contrib/README
+%{bzinstallprefix}/bugzilla/assets
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
+%attr(770,root,apache) %dir %{bzdatadir}
+%attr(770,root,apache) %dir %{bzdatadir}/assets
+%attr(750,root,apache) %dir %{_sysconfdir}/bugzilla
 %defattr(-,root,root,-)
 %doc README
 %doc README.fedora
-%license LICENSE
-%dir %{bzdatadir}
-%defattr(0750,root,apache,-)
-%dir %{_sysconfdir}/bugzilla
 
 %files doc
-%defattr(-,root,root,-)
+%defattr(-,root,apache,-)
 %{bzinstallprefix}/bugzilla/docs/en/html
 %{bzinstallprefix}/bugzilla/docs/en/images
 %{bzinstallprefix}/bugzilla/docs/en/pdf
-%{bzinstallprefix}/bugzilla/docs/en/README.docs
-%{bzinstallprefix}/bugzilla/docs/en/rel_notes.txt
 %{bzinstallprefix}/bugzilla/docs/en/txt
-%{bzinstallprefix}/bugzilla/docs/bugzilla.ent
+%{bzinstallprefix}/bugzilla/docs/en/rst
 %{bzinstallprefix}/bugzilla/docs/style.css
-%{bzinstallprefix}/bugzilla/docs/bugzilla.ent.tmpl
-%{bzinstallprefix}/bugzilla/docs/xsl/bugzilla-docs.xsl
-%{bzinstallprefix}/bugzilla/docs/xsl/chunks.xsl
-%{bzinstallprefix}/bugzilla/docs/xsl/nochunks.xsl
-%{bzinstallprefix}/bugzilla/docs/xsl/pdf.xsl
 
 
 %files doc-build
-%defattr(-,root,root,-)
+%defattr(-,root,apache,-)
 %{bzinstallprefix}/bugzilla/docs/makedocs.pl
 %{bzinstallprefix}/bugzilla/docs/lib
-%{bzinstallprefix}/bugzilla/docs/en/xml
 
 %files contrib
-%defattr(-,root,root,-)
+%defattr(-,root,apache,-)
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-submit
@@ -215,7 +235,6 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/cmdline
 %{bzinstallprefix}/bugzilla/contrib/console.pl
 %{bzinstallprefix}/bugzilla/contrib/convert-workflow.pl
-%{bzinstallprefix}/bugzilla/contrib/cvs-update.pl
 %{bzinstallprefix}/bugzilla/contrib/extension-convert.pl
 %{bzinstallprefix}/bugzilla/contrib/fixperms.pl
 %{bzinstallprefix}/bugzilla/contrib/jb2bz.py*
@@ -229,15 +248,32 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
-* Wed Dec 23 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.11-1
-- Update to 4.4.11
+* Sat Jan 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-1
+- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609)
+- Use dnf instead of yum when advising to install perl modules
+- Change documentation URL to bugzilla.readthedocs.org
 
-* Sun Sep 13 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.10-1
-- Update to 4.4.10
-- Use %%license to flag the LICENSE file
+* Mon Sep 28 2015 Tuomo Soini <tis@foobar.fi> - 5.0.1-3
+- fix data directory permissions and config dir permissions
 
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.4.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+* Mon Sep 28 2015 Tuomo Soini <tis@foobar.fi> - 5.0.1-2
+- Fix file owners to be mostly correct
+- rewrite patching of paths in Constants.pm
+
+* Fri Sep 11 2015 Tuomo Soini <tis@foobar.fi> - 5.0.1-1
+- Update to 5.0.1 new stable series
+- update dependencies for 5.0.1
+- build documentation
+- add documentation build dependencies
+
+* Thu Sep 10 2015 Tuomo Soini <tis@foobar.fi> - 4.4.10-1
+- Update to 4.4.10 to fix CVE-2015-4499
+
+* Wed Jun 17 2015 Tuomo Soini <tis@foobar.fi> - 4.4.9-1
+- Update to 4.4.9 for several important bug fixes
+
+* Tue Jun 16 2015 Tuomo Soini <tis@foobar.fi> - 4.4.8-1
+- Import from rawhide (F23)
 
 * Sat Jan 31 2015 Emmanuel Seyman <emmanuel@seyman.fr> - 4.4.8-1
 - Update to 4.4.8 (fixes regressions in 4.4.7 which itself
diff --git a/sources b/sources
index 17f0e7a..fd424e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d3380aba9b4f4b606a804b00f1a56bf1  bugzilla-4.4.11.tar.gz
+84e6a070d425846d55a1f926e883957e  bugzilla-5.0.2.tar.gz

From 0a8472a7dfddaf061771b653157ede084fa4269e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 17:16:34 +0000
Subject: [PATCH 05/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 396ab7a..caf3a93 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.2
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -248,6 +248,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Sat Jan 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-1
 - Update to 5.0.2, with thnaks to Tuomo Soini (#1275609)
 - Use dnf instead of yum when advising to install perl modules

From a703d31a8f4ec536d1f08bc16092b351ecde5201 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 1 May 2016 18:14:04 +0200
Subject: [PATCH 06/51] backport patch to prevent email address encoding

---
 bugzilla-email-encode.patch | 50 +++++++++++++++++++++++++++++++++++++
 bugzilla.spec               | 13 +++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 bugzilla-email-encode.patch

diff --git a/bugzilla-email-encode.patch b/bugzilla-email-encode.patch
new file mode 100644
index 0000000..70c2953
--- /dev/null
+++ b/bugzilla-email-encode.patch
@@ -0,0 +1,50 @@
+diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm
+index 7b5843a..8c6c141 100644
+--- a/Bugzilla/MIME.pm
++++ b/Bugzilla/MIME.pm
+@@ -13,9 +13,6 @@ use warnings;
+ 
+ use parent qw(Email::MIME);
+ 
+-use Encode qw(encode);
+-use Encode::MIME::Header;
+-
+ sub new {
+     my ($class, $msg) = @_;
+     state $use_utf8 = Bugzilla->params->{'utf8'};
+@@ -79,20 +76,12 @@ sub as_string {
+     # MIME-Version must be set otherwise some mailsystems ignore the charset
+     $self->header_set('MIME-Version', '1.0') if !$self->header('MIME-Version');
+ 
+-    # Encode the headers correctly in quoted-printable
++    # Encode the headers correctly.
+     foreach my $header ($self->header_names) {
+         my @values = $self->header($header);
+-        # We don't recode headers that happen multiple times.
+-        next if scalar(@values) > 1;
+-        if (my $value = $values[0]) {
+-            utf8::decode($value) unless $use_utf8 && utf8::is_utf8($value);
+-
+-            # avoid excessive line wrapping done by Encode.
+-            local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998;
++        map { utf8::decode($_) if defined($_) && !utf8::is_utf8($_) } @values;
+ 
+-            my $encoded = encode('MIME-Q', $value);
+-            $self->header_set($header, $encoded);
+-        }
++        $self->header_str_set($header, @values);
+     }
+ 
+     # Ensure the character-set and encoding is set correctly on single part
+diff --git a/attachment.cgi b/attachment.cgi
+index 5db8f59..40b0c9d 100755
+--- a/attachment.cgi
++++ b/attachment.cgi
+@@ -26,6 +26,7 @@ use Bugzilla::Attachment::PatchReader;
+ use Bugzilla::Token;
+ 
+ use Encode qw(encode find_encoding);
++use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}.
+ 
+ # For most scripts we don't make $cgi and $template global variables. But
+ # when preparing Bugzilla for mod_perl, this script used these
diff --git a/bugzilla.spec b/bugzilla.spec
index caf3a93..aff339d 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.2
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -14,6 +14,8 @@ Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
 Patch1: bugzilla-dnf.patch
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1246228
+Patch2: bugzilla-email-encode.patch
 
 BuildArch: noarch
 Requires: patchutils
@@ -130,6 +132,12 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then
     : ERROR: Patch1 did not apply cleanly
     exit 1
 fi
+%patch2 -p1
+if [ -f Bugzilla/MIME.pm.orig ]; then
+    : ERROR: Patch2 did not apply cleanly
+    exit 1
+fi
+
 # Remove bundled libs
 rm -rf lib/CGI*
 # Remove bundled binary files
@@ -248,6 +256,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun May 01 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-3
+- backport patch to prevent email address encoding
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From c2e485b289dee2cfd6d250c4cb3fbe16e88da2c3 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Mon, 16 May 2016 22:35:36 +0200
Subject: [PATCH 07/51] Update to 5.0.3, dropping backported patch

---
 .gitignore    |  1 +
 bugzilla.spec | 14 +++++---------
 sources       |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d873aa..771d696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.4.10.tar.gz
 /bugzilla-4.4.11.tar.gz
 /bugzilla-5.0.2.tar.gz
+/bugzilla-5.0.3.tar.gz
diff --git a/bugzilla.spec b/bugzilla.spec
index aff339d..fcc7b20 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
-Version: 5.0.2
+Version: 5.0.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -14,8 +14,6 @@ Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
 Patch1: bugzilla-dnf.patch
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1246228
-Patch2: bugzilla-email-encode.patch
 
 BuildArch: noarch
 Requires: patchutils
@@ -132,11 +130,6 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then
     : ERROR: Patch1 did not apply cleanly
     exit 1
 fi
-%patch2 -p1
-if [ -f Bugzilla/MIME.pm.orig ]; then
-    : ERROR: Patch2 did not apply cleanly
-    exit 1
-fi
 
 # Remove bundled libs
 rm -rf lib/CGI*
@@ -256,6 +249,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Mon May 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-1
+- Update to 5.0.3, dropping backported patch
+
 * Sun May 01 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-3
 - backport patch to prevent email address encoding
 
diff --git a/sources b/sources
index fd424e6..e160adf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84e6a070d425846d55a1f926e883957e  bugzilla-5.0.2.tar.gz
+b78365742a85cd030c87af12c196e8e9  bugzilla-5.0.3.tar.gz

From c883589de861f6b9d76626de534521949fb61a7a Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Mon, 16 May 2016 23:02:28 +0200
Subject: [PATCH 08/51] remove unused patch

---
 bugzilla-email-encode.patch | 50 -------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 bugzilla-email-encode.patch

diff --git a/bugzilla-email-encode.patch b/bugzilla-email-encode.patch
deleted file mode 100644
index 70c2953..0000000
--- a/bugzilla-email-encode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm
-index 7b5843a..8c6c141 100644
---- a/Bugzilla/MIME.pm
-+++ b/Bugzilla/MIME.pm
-@@ -13,9 +13,6 @@ use warnings;
- 
- use parent qw(Email::MIME);
- 
--use Encode qw(encode);
--use Encode::MIME::Header;
--
- sub new {
-     my ($class, $msg) = @_;
-     state $use_utf8 = Bugzilla->params->{'utf8'};
-@@ -79,20 +76,12 @@ sub as_string {
-     # MIME-Version must be set otherwise some mailsystems ignore the charset
-     $self->header_set('MIME-Version', '1.0') if !$self->header('MIME-Version');
- 
--    # Encode the headers correctly in quoted-printable
-+    # Encode the headers correctly.
-     foreach my $header ($self->header_names) {
-         my @values = $self->header($header);
--        # We don't recode headers that happen multiple times.
--        next if scalar(@values) > 1;
--        if (my $value = $values[0]) {
--            utf8::decode($value) unless $use_utf8 && utf8::is_utf8($value);
--
--            # avoid excessive line wrapping done by Encode.
--            local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998;
-+        map { utf8::decode($_) if defined($_) && !utf8::is_utf8($_) } @values;
- 
--            my $encoded = encode('MIME-Q', $value);
--            $self->header_set($header, $encoded);
--        }
-+        $self->header_str_set($header, @values);
-     }
- 
-     # Ensure the character-set and encoding is set correctly on single part
-diff --git a/attachment.cgi b/attachment.cgi
-index 5db8f59..40b0c9d 100755
---- a/attachment.cgi
-+++ b/attachment.cgi
-@@ -26,6 +26,7 @@ use Bugzilla::Attachment::PatchReader;
- use Bugzilla::Token;
- 
- use Encode qw(encode find_encoding);
-+use Encode::MIME::Header; # Required to alter Encode::Encoding{'MIME-Q'}.
- 
- # For most scripts we don't make $cgi and $template global variables. But
- # when preparing Bugzilla for mod_perl, this script used these

From 7a0709ff6fa94fcbd5c993f306da04b839167cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 24 Jun 2016 10:18:43 +0200
Subject: [PATCH 09/51] Mandatory Perl build-requires added
 <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>

---
 bugzilla.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bugzilla.spec b/bugzilla.spec
index fcc7b20..7ba263b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -35,6 +35,7 @@ Requires: perl(Locale::Language)
 Requires: webserver
 Requires: which
 # for building docs
+BuildRequires: perl-generators
 BuildRequires: perl(File::Copy::Recursive)
 BuildRequires: perl(File::Which)
 BuildRequires: perl(Memoize)

From 4e0e86a721268cad2e3a27ea65ccf57f6ff1d7d9 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Mon, 18 Jul 2016 11:12:02 +0200
Subject: [PATCH 10/51] add more build-requires && filter out optional modules

---
 bugzilla.spec | 46 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 7ba263b..7246630 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -43,12 +43,16 @@ BuildRequires: python-sphinx
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
-BuildRequires: texlive-upquote
 BuildRequires: tex-framed
 BuildRequires: tex-multirow
 BuildRequires: tex-threeparttable
 BuildRequires: tex-titlesec
 BuildRequires: tex-wrapfig
+%if 0%{?fedora}
+BuildRequires: texlive-capt-of.noarch
+BuildRequires: texlive-eqparbox.noarch
+BuildRequires: texlive-upquote
+%endif
 
 %package doc
 Summary: Bugzilla documentation
@@ -72,20 +76,50 @@ BuildRequires: python
 # mod_perl modules
 %global __requires_exclude %__requires_exclude|^perl\\(Apache2::
 %global __requires_exclude %__requires_exclude|^perl\\(ModPerl::
+# installation of optional modules
+%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$
 # authentification modules
 %global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP
 # database modules
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$
+# graphical reports and charts
+%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$
 # inbound email modules
 %global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$
+# automatic charset detection for text attachments
+%global __requires_exclude %__requires_exclude|^perl\\(Encode
+# sniff MIME type of attachments
+%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$
+# mail queueing
+%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$
+# smtp security
+%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$
 # bug moving modules
 %global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$
 %global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$
+# update notifications
+%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$
+# use html in product and group descriptions
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$
+# memcached support
+%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$
+# documentation
+%global __requires_exclude %__requires_exclude|^perl\\(File::Copy::Recursive\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$
 # xml-rpc and json-rpc modules
 %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::
 %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$
@@ -250,6 +284,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Jul 17 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-2
+- Add build requirements for texlive sub-packages
+- Filter out more optional dependencies
+
 * Mon May 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-1
 - Update to 5.0.3, dropping backported patch
 
@@ -260,7 +298,7 @@ popd > /dev/null)
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
 * Sat Jan 16 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.2-1
-- Update to 5.0.2, with thnaks to Tuomo Soini (#1275609)
+- Update to 5.0.2, with thanks to Tuomo Soini (#1275609)
 - Use dnf instead of yum when advising to install perl modules
 - Change documentation URL to bugzilla.readthedocs.org
 

From ea8a6e08bcb9dee37693bdcfb7032e78f30137b2 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 27 Nov 2016 11:47:58 +0100
Subject: [PATCH 11/51] Check for perl(JSON::RPC::Legacy::Server::CGI) instead
 of perl(JSON::RPC)

---
 bugzilla-dnf.patch | 13 +++++++++++--
 bugzilla.spec      |  5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bugzilla-dnf.patch b/bugzilla-dnf.patch
index 78c1d18..8824d21 100644
--- a/bugzilla-dnf.patch
+++ b/bugzilla-dnf.patch
@@ -1,5 +1,14 @@
---- bugzilla-4.01/Bugzilla/Install/Requirements.pm	2011-05-01 17:09:35.000000000 +0200
-+++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm	2011-05-01 17:11:28.000000000 +0200
+--- bugzilla-5.0.3/Bugzilla/Install/Requirements.pm.orig	2016-11-13 11:03:43.977035344 +0100
++++ bugzilla-5.0.3/Bugzilla/Install/Requirements.pm	2016-11-13 11:16:26.115320528 +0100
+@@ -304,7 +304,7 @@ sub OPTIONAL_MODULES {
+     },
+     {
+         package => 'JSON-RPC',
+-        module  => 'JSON::RPC',
++        module  => 'JSON::RPC::Legacy::Server::CGI',
+         version => 0,
+         feature => ['jsonrpc', 'rest'],
+     },
 @@ -648,7 +648,7 @@
      if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
          && !$check_results->{hide_all}) 
diff --git a/bugzilla.spec b/bugzilla.spec
index 7246630..d142409 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -284,6 +284,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Nov 27 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-3
+- Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC)
+
 * Sun Jul 17 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-2
 - Add build requirements for texlive sub-packages
 - Filter out more optional dependencies

From d7bd71eda52b64cb30ff903fa700c17dc60af980 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 07:07:10 +0000
Subject: [PATCH 12/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index d142409..b37182d 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -284,6 +284,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Sun Nov 27 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-3
 - Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC)
 

From 2b03c179d6b33f5050af64cf79a1be955dee3491 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Wed, 5 Apr 2017 07:39:28 +0200
Subject: [PATCH 13/51] Fix FTBFS, fix apache configuration and backport a
 File::Slurp fix

---
 bugzilla-1301887-File-Slurp-Warnings.patch | 256 +++++++++++++++++++++
 bugzilla-httpd-conf                        |   2 +-
 bugzilla.spec                              |  17 +-
 3 files changed, 271 insertions(+), 4 deletions(-)
 create mode 100644 bugzilla-1301887-File-Slurp-Warnings.patch

diff --git a/bugzilla-1301887-File-Slurp-Warnings.patch b/bugzilla-1301887-File-Slurp-Warnings.patch
new file mode 100644
index 0000000..e983cc3
--- /dev/null
+++ b/bugzilla-1301887-File-Slurp-Warnings.patch
@@ -0,0 +1,256 @@
+diff -up ./Bugzilla/Config.pm.orig ./Bugzilla/Config.pm
+--- ./Bugzilla/Config.pm.orig	2017-03-05 20:38:55.540137017 +0100
++++ ./Bugzilla/Config.pm	2017-03-05 20:40:18.954614192 +0100
+@@ -16,10 +16,9 @@ use autodie qw(:default);
+ 
+ use Bugzilla::Constants;
+ use Bugzilla::Hook;
+-use Bugzilla::Util qw(trick_taint);
++use Bugzilla::Util qw(trick_taint read_text write_text);
+ 
+ use JSON::XS;
+-use File::Slurp;
+ use File::Temp;
+ use File::Basename;
+ 
+@@ -284,7 +283,7 @@ sub write_params {
+     my $param_file = bz_locations()->{'datadir'} . '/params.json';
+ 
+     my $json_data = JSON::XS->new->canonical->pretty->encode($param_data);
+-    write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data);
++    write_text($param_file, $json_data);
+ 
+     # It's not common to edit parameters and loading
+     # Bugzilla::Install::Filesystem is slow.
+@@ -301,8 +300,8 @@ sub read_param_file {
+     my $file = bz_locations()->{'datadir'} . '/params.json';
+ 
+     if (-e $file) {
+-        my $data;
+-        read_file($file, binmode => ':utf8', buf_ref => \$data);
++        my $data = read_text($file);
++        trick_taint($data);
+ 
+         # If params.json has been manually edited and e.g. some quotes are
+         # missing, we don't want JSON::XS to leak the content of the file
+diff -up ./Bugzilla/Install/Filesystem.pm.orig ./Bugzilla/Install/Filesystem.pm
+--- ./Bugzilla/Install/Filesystem.pm.orig	2017-03-05 20:40:25.563572768 +0100
++++ ./Bugzilla/Install/Filesystem.pm	2017-03-05 20:40:53.516397565 +0100
+@@ -31,7 +31,6 @@ use File::Path;
+ use File::Basename;
+ use File::Copy qw(move);
+ use File::Spec;
+-use File::Slurp;
+ use IO::File;
+ use POSIX ();
+ 
+@@ -536,7 +535,7 @@ sub update_filesystem {
+ 
+     # Remove old assets htaccess file to force recreation with correct values.
+     if (-e "$assetsdir/.htaccess") {
+-        if (read_file("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
++        if (read_text("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
+             unlink("$assetsdir/.htaccess");
+         }
+     }
+diff -up ./Bugzilla/Install/Requirements.pm.orig ./Bugzilla/Install/Requirements.pm
+--- ./Bugzilla/Install/Requirements.pm.orig	2017-03-05 20:41:00.420354292 +0100
++++ ./Bugzilla/Install/Requirements.pm	2017-03-05 20:41:24.044206223 +0100
+@@ -156,11 +156,6 @@ sub REQUIRED_MODULES {
+         version => '1.0.1',
+     },
+     {
+-        package => 'File-Slurp',
+-        module  => 'File::Slurp',
+-        version => '9999.13',
+-    },
+-    {
+         package => 'JSON-XS',
+         module  => 'JSON::XS',
+         # 2.0 is the first version that will work with JSON::RPC.
+diff -up ./Bugzilla/JobQueue.pm.orig ./Bugzilla/JobQueue.pm
+--- ./Bugzilla/JobQueue.pm.orig	2017-03-05 20:41:33.460147206 +0100
++++ ./Bugzilla/JobQueue.pm	2017-03-05 20:42:40.659726012 +0100
+@@ -14,8 +14,8 @@ use warnings;
+ use Bugzilla::Constants;
+ use Bugzilla::Error;
+ use Bugzilla::Install::Util qw(install_string);
++use Bugzilla::Util qw(read_text);
+ use File::Basename;
+-use File::Slurp;
+ use base qw(TheSchwartz);
+ use fields qw(_worker_pidfile);
+ 
+@@ -124,7 +124,7 @@ sub subprocess_worker {
+             # And poll the PID to detect when the working has finished.
+             # We do this instead of system() to allow for the INT signal to
+             # interrup us and trigger kill_worker().
+-            my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet');
++            my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet');
+             if ($pid) {
+                 sleep(3) while(kill(0, $pid));
+             }
+@@ -139,7 +139,7 @@ sub subprocess_worker {
+ sub kill_worker {
+     my $self = Bugzilla->job_queue();
+     if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
+-        my $worker_pid = read_file($self->{_worker_pidfile});
++        my $worker_pid = read_text($self->{_worker_pidfile});
+         if ($worker_pid && kill(0, $worker_pid)) {
+             $self->debug("Stopping worker process");
+             system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
+diff -up ./Bugzilla/Template.pm.orig ./Bugzilla/Template.pm
+--- ./Bugzilla/Template.pm.orig	2017-03-05 20:42:47.460683385 +0100
++++ ./Bugzilla/Template.pm	2017-03-05 20:46:35.942251308 +0100
+@@ -32,7 +32,6 @@ use Digest::MD5 qw(md5_hex);
+ use File::Basename qw(basename dirname);
+ use File::Find;
+ use File::Path qw(rmtree mkpath);
+-use File::Slurp;
+ use File::Spec;
+ use IO::Dir;
+ use List::MoreUtils qw(firstidx);
+@@ -502,7 +501,7 @@ sub _concatenate_css {
+         next unless -e "$cgi_path/$files{$source}";
+         my $file = $skins_path . '/' . md5_hex($source) . '.css';
+         if (!-e $file) {
+-            my $content = read_file("$cgi_path/$files{$source}");
++            my $content = read_text("$cgi_path/$files{$source}");
+ 
+             # minify
+             $content =~ s{/\*.*?\*/}{}sg;   # comments
+@@ -512,7 +511,7 @@ sub _concatenate_css {
+             # rewrite urls
+             $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig;
+ 
+-            write_file($file, "/* $files{$source} */\n" . $content . "\n");
++            write_text($file, "/* $files{$source} */\n" . $content . "\n");
+         }
+         push @minified, $file;
+     }
+@@ -522,9 +521,9 @@ sub _concatenate_css {
+     if (!-e $file) {
+         my $content = '';
+         foreach my $source (@minified) {
+-            $content .= read_file($source);
++            $content .= read_text($source);
+         }
+-        write_file($file, $content);
++        write_text($file, $content);
+     }
+ 
+     $file =~ s/^\Q$cgi_path\E\///o;
+@@ -563,7 +562,7 @@ sub _concatenate_js {
+         next unless -e "$cgi_path/$files{$source}";
+         my $file = $skins_path . '/' . md5_hex($source) . '.js';
+         if (!-e $file) {
+-            my $content = read_file("$cgi_path/$files{$source}");
++            my $content = read_text("$cgi_path/$files{$source}");
+ 
+             # minimal minification
+             $content =~ s#/\*.*?\*/##sg;    # block comments
+@@ -572,7 +571,7 @@ sub _concatenate_js {
+             $content =~ s#\n{2,}#\n#g;      # blank lines
+             $content =~ s#(^\s+|\s+$)##g;   # whitespace at the start/end of file
+ 
+-            write_file($file, ";/* $files{$source} */\n" . $content . "\n");
++            write_text($file, ";/* $files{$source} */\n" . $content . "\n");
+         }
+         push @minified, $file;
+     }
+@@ -582,9 +581,9 @@ sub _concatenate_js {
+     if (!-e $file) {
+         my $content = '';
+         foreach my $source (@minified) {
+-            $content .= read_file($source);
++            $content .= read_text($source);
+         }
+-        write_file($file, $content);
++        write_text($file, $content);
+     }
+ 
+     $file =~ s/^\Q$cgi_path\E\///o;
+diff -up ./Bugzilla/Util.pm.orig ./Bugzilla/Util.pm
+--- ./Bugzilla/Util.pm.orig	2017-03-05 20:46:54.370135805 +0100
++++ ./Bugzilla/Util.pm	2017-03-05 20:48:12.190648042 +0100
+@@ -24,7 +24,7 @@ use parent qw(Exporter);
+                              validate_email_syntax check_email_syntax clean_text
+                              get_text template_var display_value disable_utf8
+                              detect_encoding email_filter
+-                             join_activity_entries);
++                             join_activity_entries read_text write_text);
+ 
+ use Bugzilla::Constants;
+ use Bugzilla::RNG qw(irand);
+@@ -39,6 +39,8 @@ use Scalar::Util qw(tainted blessed);
+ use Text::Wrap;
+ use Encode qw(encode decode resolve_alias);
+ use Encode::Guess;
++use File::Basename qw(dirname);
++use File::Temp qw(tempfile);
+ 
+ sub trick_taint {
+     require Carp;
+@@ -106,6 +108,27 @@ sub html_quote {
+     return $var;
+ }
+ 
++sub read_text {
++    my ($filename) = @_;
++    open my $fh, '<:encoding(utf-8)', $filename;
++    local $/ = undef;
++    my $content = <$fh>;
++    close $fh;
++    return $content;
++}
++
++sub write_text {
++    my ($filename, $content) = @_;
++    my ($tmp_fh, $tmp_filename) = tempfile('.tmp.XXXXXXXXXX',
++        DIR    => dirname($filename),
++        UNLINK => 0,
++    );
++    binmode $tmp_fh, ':encoding(utf-8)';
++    print $tmp_fh $content;
++    close $tmp_fh;
++    rename $tmp_filename, $filename;
++}
++
+ sub html_light_quote {
+     my ($text) = @_;
+     # admin/table.html.tmpl calls |FILTER html_light| many times.
+diff -up ./docs/en/rst/installing/linux.rst.orig ./docs/en/rst/installing/linux.rst
+--- ./docs/en/rst/installing/linux.rst.orig	2017-03-05 20:48:20.526595794 +0100
++++ ./docs/en/rst/installing/linux.rst	2017-03-05 20:49:00.375346030 +0100
+@@ -49,7 +49,7 @@ graphviz patchutils gcc 'perl(Apache2::S
+ 'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)'
+ 'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)'
+ 'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)'
+-'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)'
++'perl(File::MimeInfo::Magic)' 'perl(GD)' 'perl(GD::Graph)'
+ 'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)'
+ 'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)'
+ 'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)'
+diff -up ./docs/en/rst/installing/windows.rst.orig ./docs/en/rst/installing/windows.rst
+--- ./docs/en/rst/installing/windows.rst.orig	2017-03-05 20:49:10.415283101 +0100
++++ ./docs/en/rst/installing/windows.rst	2017-03-05 20:49:25.631187731 +0100
+@@ -85,7 +85,6 @@ Install the following mandatory modules
+ * URI
+ * List-MoreUtils
+ * Math-Random-ISAAC
+-* File-Slurp
+ * JSON-XS
+ * Win32
+ * Win32-API
+diff -up ./template/en/default/pages/release-notes.html.tmpl.orig ./template/en/default/pages/release-notes.html.tmpl
+--- ./template/en/default/pages/release-notes.html.tmpl.orig	2017-03-05 20:49:34.287133477 +0100
++++ ./template/en/default/pages/release-notes.html.tmpl	2017-03-05 20:49:52.223021059 +0100
+@@ -174,7 +174,7 @@
+ <h3 id="req_modules">Required Perl Modules</h3>
+ 
+ [% INCLUDE req_table reqs = REQUIRED_MODULES
+-                     new = ['File-Slurp','JSON-XS', 'Email-Sender']
++                     new = ['JSON-XS', 'Email-Sender']
+                      updated = ['DateTime', 'DateTime-TimeZone',
+                                 'Template-Toolkit', 'URI'] %]
+ 
diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf
index 1ed7679..bdf6d85 100644
--- a/bugzilla-httpd-conf
+++ b/bugzilla-httpd-conf
@@ -13,7 +13,7 @@ Alias /bugzilla /usr/share/bugzilla
   AddHandler cgi-script .cgi
   Options +Indexes +ExecCGI +FollowSymLinks
   DirectoryIndex index.cgi index.html
-  AllowOverride Limit Options FileInfo Indexes
+  AllowOverride Limit Options FileInfo Indexes AuthConfig
   AddType application/vnd.mozilla.xul+xml .xul
   AddType application/rdf+xml .rdf
 </Directory>
diff --git a/bugzilla.spec b/bugzilla.spec
index b37182d..e62b7f5 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -14,6 +14,7 @@ Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
 Patch1: bugzilla-dnf.patch
+Patch2: bugzilla-1301887-File-Slurp-Warnings.patch
 
 BuildArch: noarch
 Requires: patchutils
@@ -43,14 +44,16 @@ BuildRequires: python-sphinx
 BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
+BuildRequires: texlive-fncychap
 BuildRequires: tex-framed
 BuildRequires: tex-multirow
 BuildRequires: tex-threeparttable
 BuildRequires: tex-titlesec
 BuildRequires: tex-wrapfig
 %if 0%{?fedora}
-BuildRequires: texlive-capt-of.noarch
-BuildRequires: texlive-eqparbox.noarch
+BuildRequires: texlive-capt-of
+BuildRequires: texlive-eqparbox
+BuildRequires: texlive-tabulary
 BuildRequires: texlive-upquote
 %endif
 
@@ -165,6 +168,7 @@ if [ -f Bugzilla/Install/Requirements.pm.orig ]; then
     : ERROR: Patch1 did not apply cleanly
     exit 1
 fi
+%patch2 -p1
 
 # Remove bundled libs
 rm -rf lib/CGI*
@@ -174,6 +178,8 @@ rm -f js/yui/*/*.swf
 # Deal with changing /usr/local paths here instead of via patches
 %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py
 %{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb
+%{__perl} -pi -e 's|/usr/bin/env python|%{__python}|' contrib/bugzilla-submit/bugzilla-submit
+
 grep -rl '/usr/lib/sendmail\b' contrib docs \
 | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
 
@@ -284,6 +290,11 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Tue Apr 04 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-5
+- Include more dependencies to fix FTBFS (#1423283)
+- Allow AuthConfig directives in Bugzilla's directory (#1403588)
+- Backport patch to use internal functions rather than File::Slurp (#1425077)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 8a9a591c375922aa3ee243fae6458f05229f368e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 04:18:37 +0000
Subject: [PATCH 14/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index e62b7f5..7427f0b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Tue Apr 04 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-5
 - Include more dependencies to fix FTBFS (#1423283)
 - Allow AuthConfig directives in Bugzilla's directory (#1403588)

From a1ca9f922437438a006be5bd2f2b0cd92c1d312a Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Tue, 8 Aug 2017 00:22:28 +0200
Subject: [PATCH 15/51] Add BuildRequires and Requires

---
 bugzilla.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 7427f0b..9be4f3b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -24,6 +24,7 @@ Requires: perl(Date::Format) >= 2.23
 Requires: perl(DateTime) >= 0.75
 Requires: perl(DateTime::TimeZone) >= 1.64
 Requires: perl(DBI) >= 1.614
+Requires: perl(ExtUtils::MM)
 Requires: perl(Template) >= 2.24
 Requires: perl(Email::Sender) >= 1.300011
 Requires: perl(Email::MIME) >= 1.904
@@ -36,6 +37,7 @@ Requires: perl(Locale::Language)
 Requires: webserver
 Requires: which
 # for building docs
+BuildRequires: latexmk
 BuildRequires: perl-generators
 BuildRequires: perl(File::Copy::Recursive)
 BuildRequires: perl(File::Which)
@@ -53,6 +55,7 @@ BuildRequires: tex-wrapfig
 %if 0%{?fedora}
 BuildRequires: texlive-capt-of
 BuildRequires: texlive-eqparbox
+BuildRequires: texlive-needspace
 BuildRequires: texlive-tabulary
 BuildRequires: texlive-upquote
 %endif
@@ -290,6 +293,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Mon Aug 07 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-7
+- Add doc-building requirement to fix FTBS
+- Add perl(ExtUtils::MM) to the list of required modules
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 75097493586d68ae4d9079651e448adf93a515ee Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 20 Aug 2017 17:10:01 +0200
Subject: [PATCH 16/51] tighten macro expansion

---
 bugzilla.spec | 123 ++++++++++++++++++++++++++------------------------
 1 file changed, 63 insertions(+), 60 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 9be4f3b..f8e8c36 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,8 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
-Group: Applications/Publishing
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -36,6 +35,7 @@ Requires: perl(JSON::XS) >= 2.01
 Requires: perl(Locale::Language)
 Requires: webserver
 Requires: which
+
 # for building docs
 BuildRequires: latexmk
 BuildRequires: perl-generators
@@ -43,21 +43,20 @@ BuildRequires: perl(File::Copy::Recursive)
 BuildRequires: perl(File::Which)
 BuildRequires: perl(Memoize)
 BuildRequires: python-sphinx
-BuildRequires: texlive-collection-fontsrecommended
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
-BuildRequires: texlive-fncychap
-BuildRequires: tex-framed
-BuildRequires: tex-multirow
-BuildRequires: tex-threeparttable
-BuildRequires: tex-titlesec
-BuildRequires: tex-wrapfig
+BuildRequires: tex(fncychap.sty)
+BuildRequires: tex(framed.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(threeparttable.sty)
+BuildRequires: tex(titlesec.sty)
+BuildRequires: tex(wrapfig.sty)
 %if 0%{?fedora}
-BuildRequires: texlive-capt-of
-BuildRequires: texlive-eqparbox
-BuildRequires: texlive-needspace
-BuildRequires: texlive-tabulary
-BuildRequires: texlive-upquote
+BuildRequires: tex(capt-of.sty)
+BuildRequires: tex(eqparbox.sty)
+BuildRequires: tex(needspace.sty)
+BuildRequires: tex(tabulary.sty)
+BuildRequires: tex(upquote.sty)
 %endif
 
 %package doc
@@ -76,73 +75,72 @@ BuildRequires: python
 %{?perl_default_filter}
 
 # Remove private modules from the requires stream
-%global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(sanitycheck.cgi\\)$
 
 # Remove all optional modules from the requires stream
 # mod_perl modules
-%global __requires_exclude %__requires_exclude|^perl\\(Apache2::
-%global __requires_exclude %__requires_exclude|^perl\\(ModPerl::
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Apache2::
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(ModPerl::
 # installation of optional modules
-%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Config\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(CPAN\\)$
 # authentification modules
-%global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::Radius\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::LDAP
 # database modules
-%global __requires_exclude %__requires_exclude|^perl\\(DBD::Oracle\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(DBD::Pg\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(DBI::db\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(DBI::st\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBD::Oracle\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBD::Pg\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBI::db\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(DBI::st\\)$
 # graphical reports and charts
-%global __requires_exclude %__requires_exclude|^perl\\(Chart::Lines\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(GD::Graph\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Template::Plugin::GD::Image\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Chart::Lines\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(GD::Graph\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Template::Plugin::GD::Image\\)$
 # inbound email modules
-%global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(HTML::FormatText::WithLinks\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Email::MIME::Attachment::Stripper\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Email::Reply\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::FormatText::WithLinks\\)$
 # automatic charset detection for text attachments
-%global __requires_exclude %__requires_exclude|^perl\\(Encode
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Encode
 # sniff MIME type of attachments
-%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::MimeInfo::Magic\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(IO::Scalar\\)$
 # mail queueing
-%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(TheSchwartz\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Daemon::Generic\\)$
 # smtp security
-%global __requires_exclude %__requires_exclude|^perl\\(Authen::SASL\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Net::SMTP::SSL\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::SASL\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::SMTP::SSL\\)$
 # bug moving modules
-%global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(MIME::Parser\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(XML::Twig\\)$
 # update notifications
-%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(LWP::UserAgent\\)$
 # use html in product and group descriptions
-%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Parser\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Scrubber\\)$
 # memcached support
-%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Cache::Memcached\\)$
 # documentation
-%global __requires_exclude %__requires_exclude|^perl\\(File::Copy::Recursive\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(File::Which\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Copy::Recursive\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Which\\)$
 # xml-rpc and json-rpc modules
-%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::
-%global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$
-%global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(XMLRPC::
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTTP::Message\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::Taint\\)$
 # extension modules
-%global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$
+%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Image::Magick\\)$
 
 # and remove the extensions from the provides stream
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Login\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Auth::Verify\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::Config\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Example::WebService\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::OldBugMove::Params\\)$
-%global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::Voting\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::BmpConvert\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Auth::Login\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Auth::Verify\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::Config\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Example::WebService\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::OldBugMove\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::OldBugMove::Params\\)$
+%global __provides_exclude %{?__provides_exclude:%{__provides_exclude}|}^perl\\(Bugzilla::Extension::Voting\\)$
 
 %description
 Bugzilla is a popular bug tracking system used by multiple open source projects
@@ -293,6 +291,11 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Aug 20 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-8
+- Tighten macro expansion (thanks to ppisar)
+- Drop Group tag
+- Use tex(..) BuildRequires where possible
+
 * Mon Aug 07 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-7
 - Add doc-building requirement to fix FTBS
 - Add perl(ExtUtils::MM) to the list of required modules

From a4a058324bc73e952e1489040c7eb5dac2ff20c6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 04:16:52 +0000
Subject: [PATCH 17/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index f8e8c36..5117f6b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -291,6 +291,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Aug 20 2017 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.3-8
 - Tighten macro expansion (thanks to ppisar)
 - Drop Group tag

From f0c8d3c95c7b5242d3c95cb316b5ccbf1170dbe4 Mon Sep 17 00:00:00 2001
From: Iryna Shcherbina <shcherbina.iryna@gmail.com>
Date: Wed, 7 Feb 2018 10:34:36 +0100
Subject: [PATCH 18/51] Update Python 2 dependency declarations to new
 packaging standards

---
 bugzilla.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 5117f6b..cc2edd3 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.3
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -42,7 +42,7 @@ BuildRequires: perl-generators
 BuildRequires: perl(File::Copy::Recursive)
 BuildRequires: perl(File::Which)
 BuildRequires: perl(Memoize)
-BuildRequires: python-sphinx
+BuildRequires: python2-sphinx
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
 BuildRequires: tex(fncychap.sty)
@@ -70,7 +70,7 @@ Group: Applications/Publishing
 %package contrib
 Summary: Bugzilla contributed scripts
 Group: Applications/Publishing
-BuildRequires: python
+BuildRequires: python2
 
 %{?perl_default_filter}
 
@@ -291,6 +291,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.0.3-10
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 652fac8187c97cc74342b7a154ccc96f79d232e5 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 18 Feb 2018 16:20:02 +0100
Subject: [PATCH 19/51] update to 5.0.4

---
 .gitignore                                |  1 +
 bugzilla-1438957-concatenate-assets.patch | 12 ++++++++++++
 bugzilla.spec                             | 18 ++++++++++++------
 sources                                   |  2 +-
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 bugzilla-1438957-concatenate-assets.patch

diff --git a/.gitignore b/.gitignore
index 771d696..c0922ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.4.11.tar.gz
 /bugzilla-5.0.2.tar.gz
 /bugzilla-5.0.3.tar.gz
+/bugzilla-5.0.4.tar.gz
diff --git a/bugzilla-1438957-concatenate-assets.patch b/bugzilla-1438957-concatenate-assets.patch
new file mode 100644
index 0000000..a678976
--- /dev/null
+++ b/bugzilla-1438957-concatenate-assets.patch
@@ -0,0 +1,12 @@
+diff -up ./Bugzilla/Constants.pm.orig ./Bugzilla/Constants.pm
+--- ./Bugzilla/Constants.pm.orig	2018-02-18 12:22:45.541837039 +0100
++++ ./Bugzilla/Constants.pm	2018-02-18 12:22:53.538784733 +0100
+@@ -213,7 +213,7 @@ use constant LOCAL_FILE  => 'bugzilla-up
+ # When true CSS and JavaScript assets will be concatanted and minified at
+ # run-time, to reduce the number of requests required to render a page.
+ # Setting this to a false value can help debugging.
+-use constant CONCATENATE_ASSETS => 1;
++use constant CONCATENATE_ASSETS => 0;
+ 
+ # These are unique values that are unlikely to match a string or a number,
+ # to be used in criteria for match() functions and other things. They start
diff --git a/bugzilla.spec b/bugzilla.spec
index cc2edd3..1cb5851 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,8 +4,8 @@
 Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
-Version: 5.0.3
-Release: 10%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -13,7 +13,7 @@ Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
 Patch1: bugzilla-dnf.patch
-Patch2: bugzilla-1301887-File-Slurp-Warnings.patch
+Patch2: bugzilla-1438957-concatenate-assets.patch
 
 BuildArch: noarch
 Requires: patchutils
@@ -71,6 +71,7 @@ Group: Applications/Publishing
 Summary: Bugzilla contributed scripts
 Group: Applications/Publishing
 BuildRequires: python2
+BuildRequires: python2-rpm-macros
 
 %{?perl_default_filter}
 
@@ -177,9 +178,8 @@ rm -rf lib/CGI*
 rm -f js/yui/*/*.swf
 
 # Deal with changing /usr/local paths here instead of via patches
-%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py
-%{__perl} -pi -e 's|/usr/local/bin/ruby\b|%{_bindir}/ruby|' contrib/*.rb
-%{__perl} -pi -e 's|/usr/bin/env python|%{__python}|' contrib/bugzilla-submit/bugzilla-submit
+%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py
+%{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit
 
 grep -rl '/usr/lib/sendmail\b' contrib docs \
 | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
@@ -291,6 +291,12 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Feb 18 2018 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.4-1
+- Update to 5.0.4
+- Remove backported File::Slurp patch, no longer needed
+- use %%{__python2} instead of %%{__python}
+- Disable the concatenation of assets (#1438957)
+
 * Wed Feb 07 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.0.3-10
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
diff --git a/sources b/sources
index e160adf..6ed1eab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b78365742a85cd030c87af12c196e8e9  bugzilla-5.0.3.tar.gz
+SHA512 (bugzilla-5.0.4.tar.gz) = 9a508c623406fe71c485f85091c0dec87f7f600190bb88e6b097afaeb94a0bfc32db664609debb2265f21f48734bd040e2f5ecbf40dba0071940f31e195c8dbc

From 0a604167b563030a5e8ddabf51c1f7358a4f4e8e Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 18 Feb 2018 17:32:14 +0100
Subject: [PATCH 20/51] get rid of no longer used patch

---
 bugzilla-1301887-File-Slurp-Warnings.patch | 256 ---------------------
 1 file changed, 256 deletions(-)
 delete mode 100644 bugzilla-1301887-File-Slurp-Warnings.patch

diff --git a/bugzilla-1301887-File-Slurp-Warnings.patch b/bugzilla-1301887-File-Slurp-Warnings.patch
deleted file mode 100644
index e983cc3..0000000
--- a/bugzilla-1301887-File-Slurp-Warnings.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-diff -up ./Bugzilla/Config.pm.orig ./Bugzilla/Config.pm
---- ./Bugzilla/Config.pm.orig	2017-03-05 20:38:55.540137017 +0100
-+++ ./Bugzilla/Config.pm	2017-03-05 20:40:18.954614192 +0100
-@@ -16,10 +16,9 @@ use autodie qw(:default);
- 
- use Bugzilla::Constants;
- use Bugzilla::Hook;
--use Bugzilla::Util qw(trick_taint);
-+use Bugzilla::Util qw(trick_taint read_text write_text);
- 
- use JSON::XS;
--use File::Slurp;
- use File::Temp;
- use File::Basename;
- 
-@@ -284,7 +283,7 @@ sub write_params {
-     my $param_file = bz_locations()->{'datadir'} . '/params.json';
- 
-     my $json_data = JSON::XS->new->canonical->pretty->encode($param_data);
--    write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data);
-+    write_text($param_file, $json_data);
- 
-     # It's not common to edit parameters and loading
-     # Bugzilla::Install::Filesystem is slow.
-@@ -301,8 +300,8 @@ sub read_param_file {
-     my $file = bz_locations()->{'datadir'} . '/params.json';
- 
-     if (-e $file) {
--        my $data;
--        read_file($file, binmode => ':utf8', buf_ref => \$data);
-+        my $data = read_text($file);
-+        trick_taint($data);
- 
-         # If params.json has been manually edited and e.g. some quotes are
-         # missing, we don't want JSON::XS to leak the content of the file
-diff -up ./Bugzilla/Install/Filesystem.pm.orig ./Bugzilla/Install/Filesystem.pm
---- ./Bugzilla/Install/Filesystem.pm.orig	2017-03-05 20:40:25.563572768 +0100
-+++ ./Bugzilla/Install/Filesystem.pm	2017-03-05 20:40:53.516397565 +0100
-@@ -31,7 +31,6 @@ use File::Path;
- use File::Basename;
- use File::Copy qw(move);
- use File::Spec;
--use File::Slurp;
- use IO::File;
- use POSIX ();
- 
-@@ -536,7 +535,7 @@ sub update_filesystem {
- 
-     # Remove old assets htaccess file to force recreation with correct values.
-     if (-e "$assetsdir/.htaccess") {
--        if (read_file("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
-+        if (read_text("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
-             unlink("$assetsdir/.htaccess");
-         }
-     }
-diff -up ./Bugzilla/Install/Requirements.pm.orig ./Bugzilla/Install/Requirements.pm
---- ./Bugzilla/Install/Requirements.pm.orig	2017-03-05 20:41:00.420354292 +0100
-+++ ./Bugzilla/Install/Requirements.pm	2017-03-05 20:41:24.044206223 +0100
-@@ -156,11 +156,6 @@ sub REQUIRED_MODULES {
-         version => '1.0.1',
-     },
-     {
--        package => 'File-Slurp',
--        module  => 'File::Slurp',
--        version => '9999.13',
--    },
--    {
-         package => 'JSON-XS',
-         module  => 'JSON::XS',
-         # 2.0 is the first version that will work with JSON::RPC.
-diff -up ./Bugzilla/JobQueue.pm.orig ./Bugzilla/JobQueue.pm
---- ./Bugzilla/JobQueue.pm.orig	2017-03-05 20:41:33.460147206 +0100
-+++ ./Bugzilla/JobQueue.pm	2017-03-05 20:42:40.659726012 +0100
-@@ -14,8 +14,8 @@ use warnings;
- use Bugzilla::Constants;
- use Bugzilla::Error;
- use Bugzilla::Install::Util qw(install_string);
-+use Bugzilla::Util qw(read_text);
- use File::Basename;
--use File::Slurp;
- use base qw(TheSchwartz);
- use fields qw(_worker_pidfile);
- 
-@@ -124,7 +124,7 @@ sub subprocess_worker {
-             # And poll the PID to detect when the working has finished.
-             # We do this instead of system() to allow for the INT signal to
-             # interrup us and trigger kill_worker().
--            my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet');
-+            my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet');
-             if ($pid) {
-                 sleep(3) while(kill(0, $pid));
-             }
-@@ -139,7 +139,7 @@ sub subprocess_worker {
- sub kill_worker {
-     my $self = Bugzilla->job_queue();
-     if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
--        my $worker_pid = read_file($self->{_worker_pidfile});
-+        my $worker_pid = read_text($self->{_worker_pidfile});
-         if ($worker_pid && kill(0, $worker_pid)) {
-             $self->debug("Stopping worker process");
-             system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
-diff -up ./Bugzilla/Template.pm.orig ./Bugzilla/Template.pm
---- ./Bugzilla/Template.pm.orig	2017-03-05 20:42:47.460683385 +0100
-+++ ./Bugzilla/Template.pm	2017-03-05 20:46:35.942251308 +0100
-@@ -32,7 +32,6 @@ use Digest::MD5 qw(md5_hex);
- use File::Basename qw(basename dirname);
- use File::Find;
- use File::Path qw(rmtree mkpath);
--use File::Slurp;
- use File::Spec;
- use IO::Dir;
- use List::MoreUtils qw(firstidx);
-@@ -502,7 +501,7 @@ sub _concatenate_css {
-         next unless -e "$cgi_path/$files{$source}";
-         my $file = $skins_path . '/' . md5_hex($source) . '.css';
-         if (!-e $file) {
--            my $content = read_file("$cgi_path/$files{$source}");
-+            my $content = read_text("$cgi_path/$files{$source}");
- 
-             # minify
-             $content =~ s{/\*.*?\*/}{}sg;   # comments
-@@ -512,7 +511,7 @@ sub _concatenate_css {
-             # rewrite urls
-             $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig;
- 
--            write_file($file, "/* $files{$source} */\n" . $content . "\n");
-+            write_text($file, "/* $files{$source} */\n" . $content . "\n");
-         }
-         push @minified, $file;
-     }
-@@ -522,9 +521,9 @@ sub _concatenate_css {
-     if (!-e $file) {
-         my $content = '';
-         foreach my $source (@minified) {
--            $content .= read_file($source);
-+            $content .= read_text($source);
-         }
--        write_file($file, $content);
-+        write_text($file, $content);
-     }
- 
-     $file =~ s/^\Q$cgi_path\E\///o;
-@@ -563,7 +562,7 @@ sub _concatenate_js {
-         next unless -e "$cgi_path/$files{$source}";
-         my $file = $skins_path . '/' . md5_hex($source) . '.js';
-         if (!-e $file) {
--            my $content = read_file("$cgi_path/$files{$source}");
-+            my $content = read_text("$cgi_path/$files{$source}");
- 
-             # minimal minification
-             $content =~ s#/\*.*?\*/##sg;    # block comments
-@@ -572,7 +571,7 @@ sub _concatenate_js {
-             $content =~ s#\n{2,}#\n#g;      # blank lines
-             $content =~ s#(^\s+|\s+$)##g;   # whitespace at the start/end of file
- 
--            write_file($file, ";/* $files{$source} */\n" . $content . "\n");
-+            write_text($file, ";/* $files{$source} */\n" . $content . "\n");
-         }
-         push @minified, $file;
-     }
-@@ -582,9 +581,9 @@ sub _concatenate_js {
-     if (!-e $file) {
-         my $content = '';
-         foreach my $source (@minified) {
--            $content .= read_file($source);
-+            $content .= read_text($source);
-         }
--        write_file($file, $content);
-+        write_text($file, $content);
-     }
- 
-     $file =~ s/^\Q$cgi_path\E\///o;
-diff -up ./Bugzilla/Util.pm.orig ./Bugzilla/Util.pm
---- ./Bugzilla/Util.pm.orig	2017-03-05 20:46:54.370135805 +0100
-+++ ./Bugzilla/Util.pm	2017-03-05 20:48:12.190648042 +0100
-@@ -24,7 +24,7 @@ use parent qw(Exporter);
-                              validate_email_syntax check_email_syntax clean_text
-                              get_text template_var display_value disable_utf8
-                              detect_encoding email_filter
--                             join_activity_entries);
-+                             join_activity_entries read_text write_text);
- 
- use Bugzilla::Constants;
- use Bugzilla::RNG qw(irand);
-@@ -39,6 +39,8 @@ use Scalar::Util qw(tainted blessed);
- use Text::Wrap;
- use Encode qw(encode decode resolve_alias);
- use Encode::Guess;
-+use File::Basename qw(dirname);
-+use File::Temp qw(tempfile);
- 
- sub trick_taint {
-     require Carp;
-@@ -106,6 +108,27 @@ sub html_quote {
-     return $var;
- }
- 
-+sub read_text {
-+    my ($filename) = @_;
-+    open my $fh, '<:encoding(utf-8)', $filename;
-+    local $/ = undef;
-+    my $content = <$fh>;
-+    close $fh;
-+    return $content;
-+}
-+
-+sub write_text {
-+    my ($filename, $content) = @_;
-+    my ($tmp_fh, $tmp_filename) = tempfile('.tmp.XXXXXXXXXX',
-+        DIR    => dirname($filename),
-+        UNLINK => 0,
-+    );
-+    binmode $tmp_fh, ':encoding(utf-8)';
-+    print $tmp_fh $content;
-+    close $tmp_fh;
-+    rename $tmp_filename, $filename;
-+}
-+
- sub html_light_quote {
-     my ($text) = @_;
-     # admin/table.html.tmpl calls |FILTER html_light| many times.
-diff -up ./docs/en/rst/installing/linux.rst.orig ./docs/en/rst/installing/linux.rst
---- ./docs/en/rst/installing/linux.rst.orig	2017-03-05 20:48:20.526595794 +0100
-+++ ./docs/en/rst/installing/linux.rst	2017-03-05 20:49:00.375346030 +0100
-@@ -49,7 +49,7 @@ graphviz patchutils gcc 'perl(Apache2::S
- 'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)'
- 'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)'
- 'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)'
--'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)'
-+'perl(File::MimeInfo::Magic)' 'perl(GD)' 'perl(GD::Graph)'
- 'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)'
- 'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)'
- 'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)'
-diff -up ./docs/en/rst/installing/windows.rst.orig ./docs/en/rst/installing/windows.rst
---- ./docs/en/rst/installing/windows.rst.orig	2017-03-05 20:49:10.415283101 +0100
-+++ ./docs/en/rst/installing/windows.rst	2017-03-05 20:49:25.631187731 +0100
-@@ -85,7 +85,6 @@ Install the following mandatory modules
- * URI
- * List-MoreUtils
- * Math-Random-ISAAC
--* File-Slurp
- * JSON-XS
- * Win32
- * Win32-API
-diff -up ./template/en/default/pages/release-notes.html.tmpl.orig ./template/en/default/pages/release-notes.html.tmpl
---- ./template/en/default/pages/release-notes.html.tmpl.orig	2017-03-05 20:49:34.287133477 +0100
-+++ ./template/en/default/pages/release-notes.html.tmpl	2017-03-05 20:49:52.223021059 +0100
-@@ -174,7 +174,7 @@
- <h3 id="req_modules">Required Perl Modules</h3>
- 
- [% INCLUDE req_table reqs = REQUIRED_MODULES
--                     new = ['File-Slurp','JSON-XS', 'Email-Sender']
-+                     new = ['JSON-XS', 'Email-Sender']
-                      updated = ['DateTime', 'DateTime-TimeZone',
-                                 'Template-Toolkit', 'URI'] %]
- 

From 4b89e8845408481cc211b663049d90b7ef10d1f8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 21:24:38 +0000
Subject: [PATCH 21/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 1cb5851..f273b03 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -291,6 +291,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Sun Feb 18 2018 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.4-1
 - Update to 5.0.4
 - Remove backported File::Slurp patch, no longer needed

From 4907aa1e0854766d2ec35373bdb6ea0e1f282356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 15 Nov 2018 12:53:54 +0100
Subject: [PATCH 22/51] 
 https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2

---
 bugzilla.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bugzilla.spec b/bugzilla.spec
index f273b03..99ebaf1 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -1,3 +1,7 @@
+# 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
 

From 6367c03b4af3c52990f80d3791231765ed998a43 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:40 +0100
Subject: [PATCH 23/51] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 bugzilla.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 99ebaf1..ab69e1a 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -65,15 +65,12 @@ BuildRequires: tex(upquote.sty)
 
 %package doc
 Summary: Bugzilla documentation
-Group: Documentation
 
 %package doc-build
 Summary: Tools to generate the Bugzilla documentation
-Group: Applications/Publishing
 
 %package contrib
 Summary: Bugzilla contributed scripts
-Group: Applications/Publishing
 BuildRequires: python2
 BuildRequires: python2-rpm-macros
 

From 782ff55adc22f532a4c6c15a926add1dca1989be Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 15:00:02 +0000
Subject: [PATCH 24/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index ab69e1a..77796f1 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MPLv1.1
 Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -292,6 +292,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 6373ec6d70256247592b093c6040533e68ee68f4 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Thu, 14 Feb 2019 21:37:49 +0100
Subject: [PATCH 25/51] Update to 5.0.6

---
 .gitignore              |  1 +
 bugzilla-dnf.patch      | 53 +++++++++++++++++-----------------
 bugzilla-rw-paths.patch | 64 ++++++++++++++++++++---------------------
 bugzilla.spec           | 25 ++++++----------
 sources                 |  2 +-
 5 files changed, 69 insertions(+), 76 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0922ac..182d354 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-5.0.2.tar.gz
 /bugzilla-5.0.3.tar.gz
 /bugzilla-5.0.4.tar.gz
+/release-5.0.6.tar.gz
diff --git a/bugzilla-dnf.patch b/bugzilla-dnf.patch
index 8824d21..f7e28e8 100644
--- a/bugzilla-dnf.patch
+++ b/bugzilla-dnf.patch
@@ -1,29 +1,30 @@
---- bugzilla-5.0.3/Bugzilla/Install/Requirements.pm.orig	2016-11-13 11:03:43.977035344 +0100
-+++ bugzilla-5.0.3/Bugzilla/Install/Requirements.pm	2016-11-13 11:16:26.115320528 +0100
-@@ -304,7 +304,7 @@ sub OPTIONAL_MODULES {
+diff -up ./Bugzilla/Install/Requirements.pm.dnf ./Bugzilla/Install/Requirements.pm
+--- ./Bugzilla/Install/Requirements.pm.dnf	2019-02-14 20:47:13.396609293 +0100
++++ ./Bugzilla/Install/Requirements.pm	2019-02-14 20:49:04.733906799 +0100
+@@ -298,7 +298,7 @@ sub OPTIONAL_MODULES {
      },
      {
-         package => 'JSON-RPC',
--        module  => 'JSON::RPC',
-+        module  => 'JSON::RPC::Legacy::Server::CGI',
-         version => 0,
-         feature => ['jsonrpc', 'rest'],
+       package => 'JSON-RPC',
+-      module  => 'JSON::RPC',
++      module  => 'JSON::RPC::Legacy::Server::CGI',
+       version => 0,
+       feature => ['jsonrpc', 'rest'],
      },
-@@ -648,7 +648,7 @@
-     if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
-         && !$check_results->{hide_all}) 
-     {
--        print install_string('install_all', { perl => $^X });
-+        # print install_string('install_all', { perl => $^X });
-     }
-     if (!$check_results->{pass}) {
-         print colored(install_string('installation_failed'), COLOR_ERROR),
-@@ -797,7 +797,7 @@
-         $package = $module->{package};
-     }
-     else {
--        $command = "$^X install-module.pl \%s";
-+        $command = "dnf install \"perl(\%s)\"";
-         # Non-Windows installations need to use module names, because
-         # CPAN doesn't understand package names.
-         $package = $module->{module};
+@@ -657,7 +657,7 @@ sub print_module_instructions {
+     && !ON_ACTIVESTATE
+     && !$check_results->{hide_all})
+   {
+-    print install_string('install_all', {perl => $^X});
++    # print install_string('install_all', {perl => $^X});
+   }
+   if (!$check_results->{pass}) {
+     print colored(install_string('installation_failed'), COLOR_ERROR), "\n\n";
+@@ -811,7 +811,7 @@ sub install_command {
+     $package = $module->{package};
+   }
+   else {
+-    $command = "$^X install-module.pl \%s";
++    $command = "dnf install \"perl(\%s)\"";
+ 
+     # Non-Windows installations need to use module names, because
+     # CPAN doesn't understand package names.
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
index 3f60dea..98a5ec9 100644
--- a/bugzilla-rw-paths.patch
+++ b/bugzilla-rw-paths.patch
@@ -1,35 +1,35 @@
-diff -up bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths bugzilla-5.0.1/Bugzilla/Constants.pm
---- bugzilla-5.0.1/Bugzilla/Constants.pm.rw-paths	2015-09-10 21:36:29.000000000 +0300
-+++ bugzilla-5.0.1/Bugzilla/Constants.pm	2015-09-28 19:20:45.347013271 +0300
-@@ -670,7 +670,7 @@ sub _bz_locations {
-         $datadir = "data";
-     }
+diff -up ./Bugzilla/Constants.pm.rw-paths ./Bugzilla/Constants.pm
+--- ./Bugzilla/Constants.pm.rw-paths	2019-02-14 20:42:11.280492600 +0100
++++ ./Bugzilla/Constants.pm	2019-02-14 20:44:39.281581534 +0100
+@@ -700,7 +700,7 @@ sub _bz_locations {
+     $datadir     = "data";
+   }
  
--    $datadir = "$libpath/$datadir";
-+    $datadir = "/var/lib/bugzilla/$datadir";
-     # We have to return absolute paths for mod_perl. 
-     # That means that if you modify these paths, they must be absolute paths.
-     return {
-@@ -682,11 +682,11 @@ sub _bz_locations {
-         'templatedir' => "$libpath/template",
-         'template_cache' => "$datadir/template",
-         'project'     => $project,
--        'localconfig' => "$libpath/$localconfig",
-+        'localconfig' => "/etc/bugzilla/$localconfig",
-         'datadir'     => $datadir,
-         'attachdir'   => "$datadir/attachments",
-         'skinsdir'    => "$libpath/skins",
--        'graphsdir'   => "$libpath/graphs",
-+        'graphsdir'   => "/var/lib/bugzilla/graphs",
-         # $webdotdir must be in the web server's tree somewhere. Even if you use a 
-         # local dot, we output images to there. Also, if $webdotdir is 
-         # not relative to the bugzilla root directory, you'll need to 
-@@ -695,7 +695,7 @@ sub _bz_locations {
-         # The script should really generate these graphs directly...
-         'webdotdir'   => "$datadir/webdot",
-         'extensionsdir' => "$libpath/extensions",
--        'assetsdir'   => "$datadir/assets",
-+        'assetsdir'   => "$libpath/assets",
-     };
+-  $datadir = "$libpath/$datadir";
++  $datadir = "/var/lib/bugzilla/$datadir";
+ 
+   # We have to return absolute paths for mod_perl.
+   # That means that if you modify these paths, they must be absolute paths.
+@@ -714,11 +714,11 @@ sub _bz_locations {
+     'templatedir'    => "$libpath/template",
+     'template_cache' => "$datadir/template",
+     'project'        => $project,
+-    'localconfig'    => "$libpath/$localconfig",
++    'localconfig'    => "/etc/bugzilla/$localconfig",
+     'datadir'        => $datadir,
+     'attachdir'      => "$datadir/attachments",
+     'skinsdir'       => "$libpath/skins",
+-    'graphsdir'      => "$libpath/graphs",
++    'graphsdir'      => "/var/lib/bugzilla/graphs",
+ 
+     # $webdotdir must be in the web server's tree somewhere. Even if you use a
+     # local dot, we output images to there. Also, if $webdotdir is
+@@ -728,7 +728,7 @@ sub _bz_locations {
+     # The script should really generate these graphs directly...
+     'webdotdir'     => "$datadir/webdot",
+     'extensionsdir' => "$libpath/extensions",
+-    'assetsdir'     => "$datadir/assets",
++    'assetsdir'     => "$libpath/assets",
+   };
  }
  
diff --git a/bugzilla.spec b/bugzilla.spec
index 77796f1..28ec416 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -8,10 +8,10 @@
 Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
-Version: 5.0.4
-Release: 3%{?dist}
+Version: 5.0.6
+Release: 1%{?dist}
 License: MPLv1.1
-Source0: https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
+Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
@@ -160,24 +160,11 @@ Tools to generate the documentation distributed with Bugzilla
 Contributed scripts and functions for Bugzilla
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-release-%{version}
 %patch0 -p1
-if [ -f Bugzilla/Constants.pm.orig ]; then
-    : ERROR: Patch0 did not apply cleanly
-    exit 1
-fi
 %patch1 -p1
-if [ -f Bugzilla/Install/Requirements.pm.orig ]; then
-    : ERROR: Patch1 did not apply cleanly
-    exit 1
-fi
 %patch2 -p1
 
-# Remove bundled libs
-rm -rf lib/CGI*
-# Remove bundled binary files
-rm -f js/yui/*/*.swf
-
 # Deal with changing /usr/local paths here instead of via patches
 %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py
 %{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit
@@ -285,6 +272,7 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/merge-users.pl
 %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl
 %{bzinstallprefix}/bugzilla/contrib/new-yui.sh
+%{bzinstallprefix}/bugzilla/contrib/perl-fmt
 %{bzinstallprefix}/bugzilla/contrib/recode.pl
 %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl
 %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl
@@ -292,6 +280,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Thu Feb 14 2019 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-1
+- Update to 5.0.6
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 6ed1eab..df32c14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bugzilla-5.0.4.tar.gz) = 9a508c623406fe71c485f85091c0dec87f7f600190bb88e6b097afaeb94a0bfc32db664609debb2265f21f48734bd040e2f5ecbf40dba0071940f31e195c8dbc
+SHA512 (release-5.0.6.tar.gz) = 941087510e2c742ffd4f9c82f6d93253e04c4bde0b3a992d7bbec7672e02604d5cc8b63a12c86b0af8f7a5f7dd8e2ee4e0fa136b4b343fe4d03fd884796a4d2c

From f3b000115f236e851a86485f70ee55037e14fd40 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 10 Mar 2019 11:45:38 +0100
Subject: [PATCH 26/51] Use python3 instead of python2

---
 bugzilla.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 28ec416..f301d2d 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -46,7 +46,7 @@ BuildRequires: perl-generators
 BuildRequires: perl(File::Copy::Recursive)
 BuildRequires: perl(File::Which)
 BuildRequires: perl(Memoize)
-BuildRequires: python2-sphinx
+BuildRequires: python3-sphinx
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
 BuildRequires: tex(fncychap.sty)
@@ -166,8 +166,8 @@ Contributed scripts and functions for Bugzilla
 %patch2 -p1
 
 # Deal with changing /usr/local paths here instead of via patches
-%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python2}|' contrib/*.py
-%{__perl} -pi -e 's|/usr/bin/env python|%{__python2}|' contrib/bugzilla-submit/bugzilla-submit
+%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py
+%{__perl} -pi -e 's|/usr/bin/env python|%{__python3}|' contrib/bugzilla-submit/bugzilla-submit
 
 grep -rl '/usr/lib/sendmail\b' contrib docs \
 | xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
@@ -280,6 +280,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Mar 10 2019 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-2
+- Use %%{__python3} instead of %%{__python2}
+- Depend on python3-sphinx instead of python2-sphinx
+
 * Thu Feb 14 2019 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-1
 - Update to 5.0.6
 

From bb38698cbc4f92a05a8c4a69f594973ae498dcfd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 19:39:44 +0000
Subject: [PATCH 27/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index f301d2d..8883d4c 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -280,6 +280,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Mar 10 2019 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-2
 - Use %%{__python3} instead of %%{__python2}
 - Depend on python3-sphinx instead of python2-sphinx

From a3effd08610c28efab07adb78416e4b1c096329a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 4 Sep 2019 14:35:31 +0200
Subject: [PATCH 28/51] Drop unused build dependency on Python 2

---
 bugzilla.spec | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 8883d4c..f8a5e01 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -71,8 +71,7 @@ Summary: Tools to generate the Bugzilla documentation
 
 %package contrib
 Summary: Bugzilla contributed scripts
-BuildRequires: python2
-BuildRequires: python2-rpm-macros
+BuildRequires: python3-devel
 
 %{?perl_default_filter}
 
@@ -280,6 +279,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Sep 04 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.6-4
+- Drop unused build dependency on Python 2
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 2e629944be9b9f83a23862d56cf64d0feed9cf4c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 13:23:12 +0000
Subject: [PATCH 29/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index f8a5e01..a6018f9 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -279,6 +279,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Wed Sep 04 2019 Miro Hrončok <mhroncok@redhat.com> - 5.0.6-4
 - Drop unused build dependency on Python 2
 

From f386283cab61d6c3a2e5d32fa5a92e0ba9297569 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Tue, 24 Mar 2020 17:12:37 +0100
Subject: [PATCH 30/51] Add all perl dependencies needed for build

---
 bugzilla.spec | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index a6018f9..596427b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -43,9 +43,20 @@ Requires: which
 # for building docs
 BuildRequires: latexmk
 BuildRequires: perl-generators
+BuildRequires: perl(constant)
+BuildRequires: perl(Cwd)
+BuildRequires: perl(Exporter)
+BuildRequires: perl(File::Basename)
 BuildRequires: perl(File::Copy::Recursive)
+BuildRequires: perl(File::Find)
+BuildRequires: perl(File::Path)
 BuildRequires: perl(File::Which)
+BuildRequires: perl(lib)
 BuildRequires: perl(Memoize)
+BuildRequires: perl(parent)
+BuildRequires: perl(Pod::Simple)
+BuildRequires: perl(strict)
+BuildRequires: perl(warnings)
 BuildRequires: python3-sphinx
 BuildRequires: texlive-collection-latexrecommended
 BuildRequires: texlive-collection-basic
@@ -279,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Tue Mar 24 2020 Jitka Plesnikova <jplesnik@redhat.com> - 5.0.6-6
+- Add all perl dependencies needed for build
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 04b6f9dffde24e1d14414210ac4f3f59d75d3480 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 13:27:54 +0000
Subject: [PATCH 31/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 596427b..3a45d95 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* 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
 

From 688bb60ec79368c080968817260d1f19f76bdf77 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 1 Aug 2020 00:16:58 +0000
Subject: [PATCH 32/51] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 3a45d95..904abff 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -9,7 +9,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* 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
 

From f1620ad7fc28dfee4cb5136cf0a5750bb12e196b Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Tue, 29 Sep 2020 20:30:16 +0200
Subject: [PATCH 33/51] Remove bytecompilation macro and add upstream mail
 patch

Remove bytecompilation macro and add upstream mail patch
---
 bugzilla-1855962-non-html-mail.patch | 19 +++++++++++++++++++
 bugzilla.spec                        | 13 +++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 bugzilla-1855962-non-html-mail.patch

diff --git a/bugzilla-1855962-non-html-mail.patch b/bugzilla-1855962-non-html-mail.patch
new file mode 100644
index 0000000..0fd0637
--- /dev/null
+++ b/bugzilla-1855962-non-html-mail.patch
@@ -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.
diff --git a/bugzilla.spec b/bugzilla.spec
index 904abff..0dbbcd7 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -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
 

From 978fff30d074432f26942c5c0c242943de103284 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Tue, 20 Oct 2020 21:26:14 +0200
Subject: [PATCH 34/51] Apply patch

---
 bugzilla.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 0dbbcd7..24211ac 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -172,13 +172,14 @@ Contributed scripts and functions for Bugzilla
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Deal with changing /usr/local paths here instead of via patches
-%{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py
-%{__perl} -pi -e 's|/usr/bin/env python|%{__python3}|' contrib/bugzilla-submit/bugzilla-submit
+/usr/bin/perl -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py
+/usr/bin/rm -rf contrib/bugzilla-submit
 
 grep -rl '/usr/lib/sendmail\b' contrib docs \
-| xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
+| xargs /usr/bin/perl -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|'
 
 %build
 # Build docs
@@ -268,7 +269,6 @@ popd > /dev/null)
 %defattr(-,root,apache,-)
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse
-%{bzinstallprefix}/bugzilla/contrib/bugzilla-submit
 %{bzinstallprefix}/bugzilla/contrib/bzdbcopy.pl
 %{bzinstallprefix}/bugzilla/contrib/bz_webservice_demo.pl
 %{bzinstallprefix}/bugzilla/contrib/cmdline
@@ -288,6 +288,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Mon Oct 19 2020 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-10
+- Replace calls to %%{__perl} with /usr/bin/perl
+- Remove contrib/bugzilla-submit (no longers works) (#1835451)
+
 * 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)

From 807cf7d7ba4d638f4c3da28ca5b56f471baa3ef2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 01:27:56 +0000
Subject: [PATCH 35/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 24211ac..e6f9f6a 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -288,6 +288,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Oct 19 2020 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-10
 - Replace calls to %%{__perl} with /usr/bin/perl
 - Remove contrib/bugzilla-submit (no longers works) (#1835451)

From 0bba40ef02fb5321a66f7e2b7f1a28c6bb18112e Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 14 Feb 2021 09:49:57 +0100
Subject: [PATCH 36/51] Add make to BuildRequires

---
 bugzilla.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index e6f9f6a..b8528cd 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -40,6 +40,7 @@ Requires: which
 
 # for building docs
 BuildRequires: latexmk
+BuildRequires: make
 BuildRequires: perl-generators
 BuildRequires: perl(constant)
 BuildRequires: perl(Cwd)
@@ -288,6 +289,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Feb 14 2021 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-12
+- Add make to BuildRequires
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From 1bc122b71d780338175d6a38ea710750285ea3bd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 13:59:30 +0000
Subject: [PATCH 37/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From deaa460bbaaa30be79da06e809608ee1f616b2b4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 18:56:51 +0000
Subject: [PATCH 38/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index b8528cd..4da0fef 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -289,6 +289,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sun Feb 14 2021 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-12
 - Add make to BuildRequires
 

From 3fd8f2ba982bf872d8d897855f440c2bc5131f2f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 22:40:35 +0000
Subject: [PATCH 39/51] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 4da0fef..b6e42b3 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -289,6 +289,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From ea9e67afcb1d517dc33e180f626c79714a1e8ea8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 22:21:06 +0000
Subject: [PATCH 40/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index b6e42b3..d50c3f5 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -289,6 +289,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 18ce8733c536b5c44f0f3cf97234f78852c367e8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 23:15:56 +0000
Subject: [PATCH 41/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index d50c3f5..923333b 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -289,6 +289,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 8c3a898b84a6e7e034b6bd133c4815e4220db2e5 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 12 Feb 2023 19:12:45 +0100
Subject: [PATCH 42/51] Add missing buildrequirement on tgtermes.sty

---
 bugzilla.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 923333b..942ad22 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -62,6 +62,7 @@ BuildRequires: texlive-collection-basic
 BuildRequires: tex(fncychap.sty)
 BuildRequires: tex(framed.sty)
 BuildRequires: tex(multirow.sty)
+BuildRequires: tex(tgtermes.sty)
 BuildRequires: tex(threeparttable.sty)
 BuildRequires: tex(titlesec.sty)
 BuildRequires: tex(wrapfig.sty)
@@ -289,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun Feb 12 2023 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-17
+- Add missing buildrequirement on tgtermes.sty (#2160038)
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From a7a641dfd5ef847fd63aaf7894e5e2a28bd27fb0 Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel@seyman.fr>
Date: Sun, 7 May 2023 12:24:16 +0200
Subject: [PATCH 43/51] Patch to build against Sphinx 6.1.3

---
 bugzilla-2180465-sphinx-build.patch | 11 +++++++++++
 bugzilla.spec                       | 16 +++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 bugzilla-2180465-sphinx-build.patch

diff --git a/bugzilla-2180465-sphinx-build.patch b/bugzilla-2180465-sphinx-build.patch
new file mode 100644
index 0000000..f6bdebb
--- /dev/null
+++ b/bugzilla-2180465-sphinx-build.patch
@@ -0,0 +1,11 @@
+diff -up ./docs/en/rst/conf.py.orig ./docs/en/rst/conf.py
+--- ./docs/en/rst/conf.py.orig	2023-04-17 12:51:46.689758866 +0200
++++ ./docs/en/rst/conf.py	2023-04-17 22:43:10.003583492 +0200
+@@ -391,5 +391,5 @@ if on_rtd:
+ else:
+     base_api_url = '../integrating/api/'
+ 
+-extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug  '),
+-            'api': (base_api_url + '%s', '')}
++extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug  %s'),
++            'api': (base_api_url + '%s', '%s')}
diff --git a/bugzilla.spec b/bugzilla.spec
index 942ad22..def372d 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 17%{?dist}
+Release: 18%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -16,6 +16,7 @@ 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
+Patch4: bugzilla-2180465-sphinx-build.patch
 
 BuildArch: noarch
 Requires: patchutils
@@ -171,10 +172,11 @@ Contributed scripts and functions for Bugzilla
 
 %prep
 %setup -q -n %{name}-release-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
 
 # Deal with changing /usr/local paths here instead of via patches
 /usr/bin/perl -pi -e 's|/usr/local/bin/python\b|%{__python3}|' contrib/*.py
@@ -290,6 +292,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Sun May 07 2023 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-18
+- Patch to build against Sphinx 6.1.3 (#2180465)
+- Use new patch syntax
+
 * Sun Feb 12 2023 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-17
 - Add missing buildrequirement on tgtermes.sty (#2160038)
 

From 8f1c7811318b1bae905ff77e9636b557f9028f4b Mon Sep 17 00:00:00 2001
From: FAS Marie Loise Nolden <loise@kde.org>
Date: Sat, 27 May 2023 19:54:36 +0000
Subject: [PATCH 44/51] Update bugzilla.spec

---
 bugzilla.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index def372d..7ba4723 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -67,13 +67,11 @@ BuildRequires: tex(tgtermes.sty)
 BuildRequires: tex(threeparttable.sty)
 BuildRequires: tex(titlesec.sty)
 BuildRequires: tex(wrapfig.sty)
-%if 0%{?fedora}
 BuildRequires: tex(capt-of.sty)
 BuildRequires: tex(eqparbox.sty)
 BuildRequires: tex(needspace.sty)
 BuildRequires: tex(tabulary.sty)
 BuildRequires: tex(upquote.sty)
-%endif
 
 %package doc
 Summary: Bugzilla documentation

From 0ad697b1b87d3912d77a55b7ec5a6cd382fce545 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 15:02:48 +0000
Subject: [PATCH 45/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 7ba4723..31fdc89 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Sun May 07 2023 Emmanuel Seyman <emmanuel@seyman.fr> - 5.0.6-18
 - Patch to build against Sphinx 6.1.3 (#2180465)
 - Use new patch syntax

From 50da18f975ffc55839b91986c7f37772b3983373 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 14:48:23 +0000
Subject: [PATCH 46/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 31fdc89..f145355 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From fcdfd48db8210e5db29ee2ebd464e43436da83d8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 23 Jan 2024 00:56:08 +0000
Subject: [PATCH 47/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index f145355..d18e957 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 49ccd136a545e92dd26126bec761fd749533434a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 18:42:27 +0000
Subject: [PATCH 48/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index d18e957..27b79a9 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -290,6 +290,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 1f470af09a09f52e747a63a1f3cb34d001e9ae09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Wed, 28 Aug 2024 08:20:19 +0200
Subject: [PATCH 49/51] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 bugzilla.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 27b79a9..f98c640 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,8 +5,9 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 22%{?dist}
-License: MPLv1.1
+Release: 23%{?dist}
+# Automatically converted from old format: MPLv1.1 - review is highly recommended.
+License: LicenseRef-Callaway-MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
@@ -290,6 +291,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 5.0.6-23
+- convert license to SPDX
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-22
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 6c0b734d1b8f33e0c9ec87298e9a6de9e52c9a2c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 13:00:24 +0000
Subject: [PATCH 50/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index f98c640..3088986 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 23%{?dist}
+Release: 24%{?dist}
 # Automatically converted from old format: MPLv1.1 - review is highly recommended.
 License: LicenseRef-Callaway-MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
@@ -291,6 +291,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 5.0.6-23
 - convert license to SPDX
 

From 8d879f23d369f8180c8503dd5f6e6345dac60dd5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 17:56:47 +0000
Subject: [PATCH 51/51] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 bugzilla.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/bugzilla.spec b/bugzilla.spec
index 3088986..41c4a86 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -5,7 +5,7 @@ Summary: Bug tracking system
 URL: https://www.bugzilla.org/
 Name: bugzilla
 Version: 5.0.6
-Release: 24%{?dist}
+Release: 25%{?dist}
 # Automatically converted from old format: MPLv1.1 - review is highly recommended.
 License: LicenseRef-Callaway-MPLv1.1
 Source0: https://github.com/bugzilla/bugzilla/archive/release-%{version}.tar.gz
@@ -291,6 +291,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.6-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild