Mageia Bugzilla – Attachment 9613 Details for
Bug 21561
Bugzilla lacks any skin / CSS
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
patch for the bugzilla RPM
fix_bugzilla_spec.patch (text/plain), 6.59 KB, created by
Frédéric "LpSolit" Buclin
on 2017-08-19 22:36:49 CEST
(
hide
)
Description:
patch for the bugzilla RPM
Filename:
MIME Type:
Creator:
Frédéric "LpSolit" Buclin
Created:
2017-08-19 22:36:49 CEST
Size:
6.59 KB
patch
obsolete
>Index: SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch >=================================================================== >--- SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch (nonexistent) >+++ SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch (copie de travail) >@@ -0,0 +1,32 @@ >+diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm >+index 41b9265c6..f0c8d54b4 100644 >+--- a/Bugzilla/Template.pm >++++ b/Bugzilla/Template.pm >+@@ -528,6 +528,7 @@ sub _concatenate_css { >+ } >+ >+ $file =~ s/^\Q$cgi_path\E\///o; >++ $file =~ s#^.*(?=/assets)#data#; >+ return mtime_filter($file); >+ } >+ >+@@ -588,6 +589,7 @@ sub _concatenate_js { >+ } >+ >+ $file =~ s/^\Q$cgi_path\E\///o; >++ $file =~ s#^.*(?=/assets)#data#; >+ return [ $file ]; >+ } >+ >+diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi >+index 7b2d2f55d..57c9e4418 100755 >+--- a/showdependencygraph.cgi >++++ b/showdependencygraph.cgi >+@@ -283,6 +283,7 @@ if ($webdotbase =~ /^https?:/) { >+ # need to make that into a relative path. >+ my $cgi_root = bz_locations()->{cgi_path}; >+ $pngfilename =~ s#^\Q$cgi_root\E/?##; >++ $pngfilename =~ s#^.*(?=webdot)##; >+ >+ $vars->{'image_url'} = $pngfilename; >+ >Index: SPECS/bugzilla.spec >=================================================================== >--- SPECS/bugzilla.spec (révision 1141690) >+++ SPECS/bugzilla.spec (copie de travail) >@@ -2,7 +2,7 @@ > > Name: bugzilla > Version: 5.0.3 >-Release: %mkrel 1 >+Release: %mkrel 2 > > Summary: A bug tracking system developed by mozilla.org > License: MPL >@@ -11,37 +11,46 @@ > Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/%{name}-%{version}%{pre}.tar.gz > Source1: Bugzilla.pm > Patch0: %{name}-fhs.patch >+Patch1: bugzilla-5.0.3-convert-absolute-paths.patch > Patch2: bugzilla-4.0.2-fix-permissions.patch > Patch3: bugzilla-4.0.2-recommend-urpmi.patch > Requires: apache >-Requires: perl(CGI) >= 1:3.510.0 >-Requires: perl(Date::Format) >= 2.23 >-Requires: perl(DateTime) >= 0.280.0 >+Requires: perl(CGI) >= 1:3.510.0 > Requires: perl(Digest::SHA) >-Requires: perl(Date::Format) >= 2.23 >-Requires: perl(File::Spec) >= 0.840.0 >-Requires: perl(DBI) >= 1.540.0 >-Requires: perl(Template) >= 2.220.0 >-Requires: perl(Email::Sender) >-Requires: perl(Email::MIME::Modifier) >-Requires: perl(Math::Random::ISAAC) >= 1.0.1 >+Requires: perl(Date::Format) >= 2.230.0 >+Requires: perl(DateTime) >= 0.750.0 >+Requires: perl(DateTime::TimeZone) >= 1.640.0 >+Requires: perl(DBI) >= 1.614.0 >+Requires: perl(Template) >= 2.240.0 >+Requires: perl(Email::Sender) >= 1.300.11 >+Requires: perl(Email::MIME) >= 1.904.0 >+Requires: perl(URI) >= 1.550.0 >+Requires: perl(List::MoreUtils) >= 0.320.0 >+Requires: perl(Math::Random::ISAAC) >= 1.1.0 > Requires: perl(Math::Random::ISAAC::XS) >-Requires: perl(Email::MIME) >= 1.904 >-Requires: perl(URI) >= 1.37 >-Requires: perl(List::MoreUtils) >= 0.32 >+Requires: perl(File::Slurp) >= 9999.130.0 >+Requires: perl(JSON::XS) >= 2.10.0 > Requires: sendmail-command > Recommends: diffutils > Recommends: graphviz > Recommends: patchutils >-Recommends: perl(DBD::mysql) >= 4.0.1 >+Recommends: perl(DBD::mysql) >= 4.10.0 > Recommends: perl(DBD::Pg) >= 2.7.0 > Recommends: perl(GD) > Recommends: perl(GD::Graph) > Recommends: perl(GD::TextUtil) > Recommends: perl(Chart::Base) >+Recommends: perl(Template::GD) > Recommends: perl(Net::LDAP) > Recommends: perl(PatchReader) >-Recommends: perl(XML::Parser) >+Recommends: perl(Authen::SASL) >+Recommends: perl(Net::SMTP::SSL) >+Recommends: perl(JSON::RPC) >+Recommends: perl(Test::Taint) >+Recommends: perl(Encode) >+Recommends: perl(Encode::Detect) >+Recommends: perl(File::MimeInfo::Magic) >+Recommends: perl(IO::Scalar) > BuildArch: noarch > > >@@ -50,6 +59,8 @@ > > # Remove private modules from the requires stream > %global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ >+%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla\\)$ >+%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla:: > > # Remove all optional modules from the requires stream > # mod_perl modules >@@ -73,8 +84,12 @@ > %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: > %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ > %global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ >+# mail queueing modules >+%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$ > # extension modules > %global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ >+# contrib scripts >+%global __requires_exclude %__requires_exclude|^python > > # and remove the extensions from the provides stream > %global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ >@@ -118,6 +133,7 @@ > (cd contrib/bugzilla-submit && mv README README.bugzilla-submit) > > %patch0 -p1 >+%patch1 -p1 > %patch2 -p1 > %patch3 -p1 > >@@ -174,10 +190,12 @@ > install -d -m 755 %{buildroot}%{_webappconfdir} > cat > %{buildroot}%{_webappconfdir}/%{name}.conf <<EOF > # Bugzilla Apache configuration >-Alias /%{name}/data %{_localstatedir}/lib/%{name}/ >+Alias /%{name}/data %{_localstatedir}/lib/%{name} >+Alias /%{name}/graphs %{_localstatedir}/lib/%{name}/graphs > Alias /%{name}/images %{_datadir}/%{name}/www/images > Alias /%{name}/js %{_datadir}/%{name}/www/js > Alias /%{name}/skins %{_datadir}/%{name}/www/skins >+Alias /%{name}/webdot %{_localstatedir}/lib/%{name}/webdot > ScriptAlias /%{name} %{_datadir}/%{name}/www > > <Directory %{_datadir}/%{name}/www> >@@ -185,16 +203,8 @@ > DirectoryIndex index.cgi > </Directory> > >-# The dot files must be accessible to the public webdot server >-# The png files locally created locally must be accessible >-<Directory %{_localstatedir}/lib/bugzilla/webdot> >- <FilesMatch \.dot$> >- Require host research.att.com >- </FilesMatch> >- >- <FilesMatch \.png$> >- Require all granted >- </FilesMatch> >+<Directory %{_localstatedir}/lib/%{name}> >+ AllowOverride All > </Directory> > EOF > >@@ -223,10 +233,10 @@ > > Additional useful packages > -------------------------- >-- perl-GD, perl-GDGraph, perl-GD-TextUtil and perl-Chart for graphical reports >-- perl-XML-Parser for importing XML bugs >+- perl-GD, perl-GDGraph, perl-GDTextUtil and perl-Template-GD for graphical reports >+- perl-XML-Twig and perl-MIME-tools for importing XML bugs > - perl-Net-LDAP for LDAP authentication >-- perl-PatchReader, cvs, diffutils and patchutils for patch viewer >+- perl-PatchReader, diffutils and patchutils for patch viewer > - graphviz for graphical view of dependency relationships > - a MySQL/MariaDB/PostgreSQL database, either locale or remote > EOF
Index: SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch =================================================================== --- SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch (nonexistent) +++ SOURCES/bugzilla-5.0.3-convert-absolute-paths.patch (copie de travail) @@ -0,0 +1,32 @@ +diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm +index 41b9265c6..f0c8d54b4 100644 +--- a/Bugzilla/Template.pm ++++ b/Bugzilla/Template.pm +@@ -528,6 +528,7 @@ sub _concatenate_css { + } + + $file =~ s/^\Q$cgi_path\E\///o; ++ $file =~ s#^.*(?=/assets)#data#; + return mtime_filter($file); + } + +@@ -588,6 +589,7 @@ sub _concatenate_js { + } + + $file =~ s/^\Q$cgi_path\E\///o; ++ $file =~ s#^.*(?=/assets)#data#; + return [ $file ]; + } + +diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi +index 7b2d2f55d..57c9e4418 100755 +--- a/showdependencygraph.cgi ++++ b/showdependencygraph.cgi +@@ -283,6 +283,7 @@ if ($webdotbase =~ /^https?:/) { + # need to make that into a relative path. + my $cgi_root = bz_locations()->{cgi_path}; + $pngfilename =~ s#^\Q$cgi_root\E/?##; ++ $pngfilename =~ s#^.*(?=webdot)##; + + $vars->{'image_url'} = $pngfilename; + Index: SPECS/bugzilla.spec =================================================================== --- SPECS/bugzilla.spec (révision 1141690) +++ SPECS/bugzilla.spec (copie de travail) @@ -2,7 +2,7 @@ Name: bugzilla Version: 5.0.3 -Release: %mkrel 1 +Release: %mkrel 2 Summary: A bug tracking system developed by mozilla.org License: MPL @@ -11,37 +11,46 @@ Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/%{name}-%{version}%{pre}.tar.gz Source1: Bugzilla.pm Patch0: %{name}-fhs.patch +Patch1: bugzilla-5.0.3-convert-absolute-paths.patch Patch2: bugzilla-4.0.2-fix-permissions.patch Patch3: bugzilla-4.0.2-recommend-urpmi.patch Requires: apache -Requires: perl(CGI) >= 1:3.510.0 -Requires: perl(Date::Format) >= 2.23 -Requires: perl(DateTime) >= 0.280.0 +Requires: perl(CGI) >= 1:3.510.0 Requires: perl(Digest::SHA) -Requires: perl(Date::Format) >= 2.23 -Requires: perl(File::Spec) >= 0.840.0 -Requires: perl(DBI) >= 1.540.0 -Requires: perl(Template) >= 2.220.0 -Requires: perl(Email::Sender) -Requires: perl(Email::MIME::Modifier) -Requires: perl(Math::Random::ISAAC) >= 1.0.1 +Requires: perl(Date::Format) >= 2.230.0 +Requires: perl(DateTime) >= 0.750.0 +Requires: perl(DateTime::TimeZone) >= 1.640.0 +Requires: perl(DBI) >= 1.614.0 +Requires: perl(Template) >= 2.240.0 +Requires: perl(Email::Sender) >= 1.300.11 +Requires: perl(Email::MIME) >= 1.904.0 +Requires: perl(URI) >= 1.550.0 +Requires: perl(List::MoreUtils) >= 0.320.0 +Requires: perl(Math::Random::ISAAC) >= 1.1.0 Requires: perl(Math::Random::ISAAC::XS) -Requires: perl(Email::MIME) >= 1.904 -Requires: perl(URI) >= 1.37 -Requires: perl(List::MoreUtils) >= 0.32 +Requires: perl(File::Slurp) >= 9999.130.0 +Requires: perl(JSON::XS) >= 2.10.0 Requires: sendmail-command Recommends: diffutils Recommends: graphviz Recommends: patchutils -Recommends: perl(DBD::mysql) >= 4.0.1 +Recommends: perl(DBD::mysql) >= 4.10.0 Recommends: perl(DBD::Pg) >= 2.7.0 Recommends: perl(GD) Recommends: perl(GD::Graph) Recommends: perl(GD::TextUtil) Recommends: perl(Chart::Base) +Recommends: perl(Template::GD) Recommends: perl(Net::LDAP) Recommends: perl(PatchReader) -Recommends: perl(XML::Parser) +Recommends: perl(Authen::SASL) +Recommends: perl(Net::SMTP::SSL) +Recommends: perl(JSON::RPC) +Recommends: perl(Test::Taint) +Recommends: perl(Encode) +Recommends: perl(Encode::Detect) +Recommends: perl(File::MimeInfo::Magic) +Recommends: perl(IO::Scalar) BuildArch: noarch @@ -50,6 +59,8 @@ # Remove private modules from the requires stream %global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla\\)$ +%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla:: # Remove all optional modules from the requires stream # mod_perl modules @@ -73,8 +84,12 @@ %global __requires_exclude %__requires_exclude|^perl\\(XMLRPC:: %global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$ %global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$ +# mail queueing modules +%global __requires_exclude %__requires_exclude|^perl\\(TheSchwartz\\)$ # extension modules %global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$ +# contrib scripts +%global __requires_exclude %__requires_exclude|^python # and remove the extensions from the provides stream %global __provides_exclude %__provides_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$ @@ -118,6 +133,7 @@ (cd contrib/bugzilla-submit && mv README README.bugzilla-submit) %patch0 -p1 +%patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -174,10 +190,12 @@ install -d -m 755 %{buildroot}%{_webappconfdir} cat > %{buildroot}%{_webappconfdir}/%{name}.conf <<EOF # Bugzilla Apache configuration -Alias /%{name}/data %{_localstatedir}/lib/%{name}/ +Alias /%{name}/data %{_localstatedir}/lib/%{name} +Alias /%{name}/graphs %{_localstatedir}/lib/%{name}/graphs Alias /%{name}/images %{_datadir}/%{name}/www/images Alias /%{name}/js %{_datadir}/%{name}/www/js Alias /%{name}/skins %{_datadir}/%{name}/www/skins +Alias /%{name}/webdot %{_localstatedir}/lib/%{name}/webdot ScriptAlias /%{name} %{_datadir}/%{name}/www <Directory %{_datadir}/%{name}/www> @@ -185,16 +203,8 @@ DirectoryIndex index.cgi </Directory> -# The dot files must be accessible to the public webdot server -# The png files locally created locally must be accessible -<Directory %{_localstatedir}/lib/bugzilla/webdot> - <FilesMatch \.dot$> - Require host research.att.com - </FilesMatch> - - <FilesMatch \.png$> - Require all granted - </FilesMatch> +<Directory %{_localstatedir}/lib/%{name}> + AllowOverride All </Directory> EOF @@ -223,10 +233,10 @@ Additional useful packages -------------------------- -- perl-GD, perl-GDGraph, perl-GD-TextUtil and perl-Chart for graphical reports -- perl-XML-Parser for importing XML bugs +- perl-GD, perl-GDGraph, perl-GDTextUtil and perl-Template-GD for graphical reports +- perl-XML-Twig and perl-MIME-tools for importing XML bugs - perl-Net-LDAP for LDAP authentication -- perl-PatchReader, cvs, diffutils and patchutils for patch viewer +- perl-PatchReader, diffutils and patchutils for patch viewer - graphviz for graphical view of dependency relationships - a MySQL/MariaDB/PostgreSQL database, either locale or remote EOF
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 21561
:
9612
| 9613