From 5de81987593bd677515df71e6deebf866ce8e186 Mon Sep 17 00:00:00 2001 From: Emmanuel Seyman Date: Tue, 20 Oct 2020 21:26:14 +0200 Subject: [PATCH] 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 - 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 - 5.0.6-9 - Remove automagic Python bytecompilation macro - Include upstream patch for text mails (#1855962)