diff --git a/.gitignore b/.gitignore index 182d354..771d696 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,3 @@ 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 -/release-5.0.6.tar.gz diff --git a/bugzilla-1438957-concatenate-assets.patch b/bugzilla-1438957-concatenate-assets.patch deleted file mode 100644 index a678976..0000000 --- a/bugzilla-1438957-concatenate-assets.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-1855962-non-html-mail.patch b/bugzilla-1855962-non-html-mail.patch deleted file mode 100644 index 0fd0637..0000000 --- a/bugzilla-1855962-non-html-mail.patch +++ /dev/null @@ -1,19 +0,0 @@ -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-2180465-sphinx-build.patch b/bugzilla-2180465-sphinx-build.patch deleted file mode 100644 index f6bdebb..0000000 --- a/bugzilla-2180465-sphinx-build.patch +++ /dev/null @@ -1,11 +0,0 @@ -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-dnf.patch b/bugzilla-dnf.patch index f7e28e8..8824d21 100644 --- a/bugzilla-dnf.patch +++ b/bugzilla-dnf.patch @@ -1,30 +1,29 @@ -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 { +--- 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'], + package => 'JSON-RPC', +- module => 'JSON::RPC', ++ module => 'JSON::RPC::Legacy::Server::CGI', + version => 0, + feature => ['jsonrpc', 'rest'], }, -@@ -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. +@@ -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}; diff --git a/bugzilla-httpd-conf b/bugzilla-httpd-conf index bdf6d85..1ed7679 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 AuthConfig + AllowOverride Limit Options FileInfo Indexes AddType application/vnd.mozilla.xul+xml .xul AddType application/rdf+xml .rdf diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch index 98a5ec9..3f60dea 100644 --- a/bugzilla-rw-paths.patch +++ b/bugzilla-rw-paths.patch @@ -1,35 +1,35 @@ -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"; - } +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. -@@ -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", - }; +- $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", + }; } diff --git a/bugzilla.spec b/bugzilla.spec index 41c4a86..d43f4bd 100644 --- a/bugzilla.spec +++ b/bugzilla.spec @@ -4,20 +4,16 @@ Summary: Bug tracking system URL: https://www.bugzilla.org/ Name: bugzilla -Version: 5.0.6 -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 +Version: 5.0.3 +Group: Applications/Publishing +Release: 2%{?dist} +License: MPLv1.1 +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-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 @@ -27,7 +23,6 @@ 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 @@ -39,120 +34,108 @@ Requires: perl(JSON::XS) >= 2.01 Requires: perl(Locale::Language) Requires: webserver Requires: which - # for building docs -BuildRequires: latexmk -BuildRequires: make -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: python-sphinx +BuildRequires: texlive-collection-fontsrecommended BuildRequires: texlive-collection-latexrecommended 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) -BuildRequires: tex(capt-of.sty) -BuildRequires: tex(eqparbox.sty) -BuildRequires: tex(needspace.sty) -BuildRequires: tex(tabulary.sty) -BuildRequires: tex(upquote.sty) +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 +Group: Documentation %package doc-build Summary: Tools to generate the Bugzilla documentation +Group: Applications/Publishing %package contrib Summary: Bugzilla contributed scripts -BuildRequires: python3-devel +Group: Applications/Publishing +BuildRequires: python %{?perl_default_filter} # Remove private modules from the requires stream -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(sanitycheck.cgi\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ # Remove all optional modules from the requires stream # mod_perl modules -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Apache2:: -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(ModPerl:: +%global __requires_exclude %__requires_exclude|^perl\\(Apache2:: +%global __requires_exclude %__requires_exclude|^perl\\(ModPerl:: # installation of optional modules -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Config\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(CPAN\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Config\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(CPAN\\)$ # authentification modules -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::Radius\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::LDAP +%global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP # database modules -%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\\)$ +%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:%{__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\\)$ +%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:%{__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\\)$ +%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:%{__requires_exclude}|}^perl\\(Encode +%global __requires_exclude %__requires_exclude|^perl\\(Encode # sniff MIME type of attachments -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::MimeInfo::Magic\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(IO::Scalar\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(File::MimeInfo::Magic\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(IO::Scalar\\)$ # mail queueing -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(TheSchwartz\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Daemon::Generic\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Daemon::Generic\\)$ # smtp security -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Authen::SASL\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Net::SMTP::SSL\\)$ +%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:%{__requires_exclude}|}^perl\\(MIME::Parser\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(XML::Twig\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$ # update notifications -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(LWP::UserAgent\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(LWP::UserAgent\\)$ # use html in product and group descriptions -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Parser\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTML::Scrubber\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(HTML::Parser\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(HTML::Scrubber\\)$ # memcached support -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Cache::Memcached\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Cache::Memcached\\)$ # documentation -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Copy::Recursive\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(File::Which\\)$ +%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:%{__requires_exclude}|}^perl\\(XMLRPC:: -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(HTTP::Message\\)$ -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Test::Taint\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: +%global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ # extension modules -%global __requires_exclude %{?__requires_exclude:%{__requires_exclude}|}^perl\\(Image::Magick\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ # and remove the extensions from the provides stream -%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\\)$ +%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\\)$ %description Bugzilla is a popular bug tracking system used by multiple open source projects @@ -170,19 +153,28 @@ Tools to generate the documentation distributed with Bugzilla Contributed scripts and functions for Bugzilla %prep -%setup -q -n %{name}-release-%{version} -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 +%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 +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 +rm -f js/yui/*/*.swf # 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 -/usr/bin/rm -rf contrib/bugzilla-submit - +%{__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 grep -rl '/usr/lib/sendmail\b' contrib docs \ -| xargs /usr/bin/perl -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' +| xargs %{__perl} -pi -e 's|/usr/lib/sendmail\b|%{_sbindir}/sendmail|' %build # Build docs @@ -272,6 +264,7 @@ 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 @@ -283,7 +276,6 @@ 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 @@ -291,128 +283,8 @@ popd > /dev/null) %{bzinstallprefix}/bugzilla/contrib/Bugzilla.pm %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 5.0.6-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 5.0.6-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Aug 28 2024 Miroslav Suchý - 5.0.6-23 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 5.0.6-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jan 23 2024 Fedora Release Engineering - 5.0.6-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 5.0.6-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 5.0.6-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun May 07 2023 Emmanuel Seyman - 5.0.6-18 -- Patch to build against Sphinx 6.1.3 (#2180465) -- Use new patch syntax - -* Sun Feb 12 2023 Emmanuel Seyman - 5.0.6-17 -- Add missing buildrequirement on tgtermes.sty (#2160038) - -* Wed Jan 18 2023 Fedora Release Engineering - 5.0.6-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 5.0.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 5.0.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 5.0.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Feb 14 2021 Emmanuel Seyman - 5.0.6-12 -- Add make to BuildRequires - -* Tue Jan 26 2021 Fedora Release Engineering - 5.0.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* 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) - -* Sat Aug 01 2020 Fedora Release Engineering - 5.0.6-8 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 5.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Tue Mar 24 2020 Jitka Plesnikova - 5.0.6-6 -- Add all perl dependencies needed for build - -* Tue Jan 28 2020 Fedora Release Engineering - 5.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Sep 04 2019 Miro Hrončok - 5.0.6-4 -- Drop unused build dependency on Python 2 - -* Wed Jul 24 2019 Fedora Release Engineering - 5.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Mar 10 2019 Emmanuel Seyman - 5.0.6-2 -- Use %%{__python3} instead of %%{__python2} -- Depend on python3-sphinx instead of python2-sphinx - -* Thu Feb 14 2019 Emmanuel Seyman - 5.0.6-1 -- Update to 5.0.6 - -* Thu Jan 31 2019 Fedora Release Engineering - 5.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 5.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 18 2018 Emmanuel Seyman - 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 - 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 - 5.0.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Aug 20 2017 Emmanuel Seyman - 5.0.3-8 -- Tighten macro expansion (thanks to ppisar) -- Drop Group tag -- Use tex(..) BuildRequires where possible - -* Mon Aug 07 2017 Emmanuel Seyman - 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 - 5.0.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Apr 04 2017 Emmanuel Seyman - 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 - 5.0.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Nov 27 2016 Emmanuel Seyman - 5.0.3-3 +* Sun Nov 27 2016 Emmanuel Seyman - 5.0.3-2 - Check for perl(JSON::RPC::Legacy::Server::CGI) instead of perl(JSON::RPC) - -* Sun Jul 17 2016 Emmanuel Seyman - 5.0.3-2 - Add build requirements for texlive sub-packages - Filter out more optional dependencies diff --git a/sources b/sources index df32c14..e160adf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (release-5.0.6.tar.gz) = 941087510e2c742ffd4f9c82f6d93253e04c4bde0b3a992d7bbec7672e02604d5cc8b63a12c86b0af8f7a5f7dd8e2ee4e0fa136b4b343fe4d03fd884796a4d2c +b78365742a85cd030c87af12c196e8e9 bugzilla-5.0.3.tar.gz