rpms/bugzilla/devel bugzilla-graphs-dir.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 bugzilla.spec, 1.34, 1.35 sources, 1.18, 1.19
Emmanuel Seyman
eseyman at fedoraproject.org
Tue Jun 1 12:14:09 UTC 2010
Author: eseyman
Update of /cvs/pkgs/rpms/bugzilla/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19681
Modified Files:
.cvsignore bugzilla.spec sources
Added Files:
bugzilla-graphs-dir.patch
Log Message:
- Update to 3.6
- Put graphs in /var/lib/bugzilla/
bugzilla-graphs-dir.patch:
Bugzilla/Constants.pm | 1 +
Bugzilla/Install/Filesystem.pm | 8 +++++---
collectstats.pl | 2 +-
reports.cgi | 6 ++++--
4 files changed, 11 insertions(+), 6 deletions(-)
--- NEW FILE bugzilla-graphs-dir.patch ---
Index: collectstats.pl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/collectstats.pl,v
retrieving revision 1.71
diff -u -r1.71 collectstats.pl
--- collectstats.pl 6 Sep 2009 22:45:51 -0000 1.71
+++ collectstats.pl 16 May 2010 09:22:28 -0000
@@ -51,7 +51,7 @@
# Tidy up after graphing module
my $cwd = Cwd::getcwd();
-if (chdir("graphs")) {
+if (chdir(bz_locations()->{'graphdir'})) {
unlink <./*.gif>;
unlink <./*.png>;
# chdir("..") doesn't work if graphs is a symlink, see bug 429378
Index: reports.cgi
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/reports.cgi,v
retrieving revision 1.95
diff -u -r1.95 reports.cgi
--- reports.cgi 24 Oct 2009 05:21:06 -0000 1.95
+++ reports.cgi 16 May 2010 09:22:28 -0000
@@ -45,6 +45,8 @@
use Bugzilla::Error;
use Bugzilla::Status;
+use File::Basename;
+
# If we're using bug groups for products, we should apply those restrictions
# to viewing reports, as well. Time to check the login in that case.
my $user = Bugzilla->login();
@@ -54,8 +56,8 @@
}
my $dir = bz_locations()->{'datadir'} . "/mining";
-my $graph_url = 'graphs';
-my $graph_dir = bz_locations()->{'libpath'} . '/' .$graph_url;
+my $graph_dir = bz_locations()->{'graphdir'};
+my $graph_url = basename($graph_dir);
Bugzilla->switch_to_shadow_db();
Index: Bugzilla/Constants.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Constants.pm,v
retrieving revision 1.126.2.5
diff -u -r1.126.2.5 Constants.pm
--- Bugzilla/Constants.pm 13 Apr 2010 04:56:24 -0000 1.126.2.5
+++ Bugzilla/Constants.pm 16 May 2010 09:22:29 -0000
@@ -551,6 +551,7 @@
# The script should really generate these graphs directly...
'webdotdir' => "/var/lib/bugzilla/$datadir/webdot",
'extensionsdir' => "$libpath/extensions",
+ 'graphdir' => "$libpath/graphs",
};
}
Index: Bugzilla/Install/Filesystem.pm
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm,v
retrieving revision 1.47.2.1
diff -u -r1.47.2.1 Filesystem.pm
--- Bugzilla/Install/Filesystem.pm 20 Feb 2010 20:20:55 -0000 1.47.2.1
+++ Bugzilla/Install/Filesystem.pm 16 May 2010 09:22:29 -0000
@@ -69,6 +69,7 @@
my $attachdir = bz_locations()->{'attachdir'};
my $extensionsdir = bz_locations()->{'extensionsdir'};
my $webdotdir = bz_locations()->{'webdotdir'};
+ my $graphdir = bz_locations()->{'graphdir'};
my $templatedir = bz_locations()->{'templatedir'};
my $libdir = bz_locations()->{'libpath'};
my $extlib = bz_locations()->{'ext_libpath'};
@@ -162,7 +163,7 @@
dirs => $ws_dir_writeable },
$webdotdir => { files => $ws_writeable,
dirs => $ws_dir_writeable },
- graphs => { files => $ws_writeable,
+ $graphdir => { files => $ws_writeable,
dirs => $ws_dir_writeable },
# Readable directories
@@ -212,7 +213,7 @@
"$datadir/extensions" => $ws_dir_readable,
$attachdir => $ws_dir_writeable,
$extensionsdir => $ws_dir_readable,
- graphs => $ws_dir_writeable,
+ $graphdir => $ws_dir_writeable,
$webdotdir => $ws_dir_writeable,
"$skinsdir/custom" => $ws_dir_readable,
"$skinsdir/contrib" => $ws_dir_readable,
@@ -342,10 +343,11 @@
my %files = %{$fs->{create_files}};
my $datadir = bz_locations->{'datadir'};
+ my $graphdir = bz_locations->{'graphdir'};
# If the graphs/ directory doesn't exist, we're upgrading from
# a version old enough that we need to update the $datadir/mining
# format.
- if (-d "$datadir/mining" && !-d 'graphs') {
+ if (-d "$datadir/mining" && !-d $graphdir) {
_update_old_charts($datadir);
}
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore 1 Feb 2010 11:01:52 -0000 1.18
+++ .cvsignore 1 Jun 2010 12:14:09 -0000 1.19
@@ -1 +1 @@
-bugzilla-3.4.5.tar.gz
+bugzilla-3.6.tar.gz
Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/bugzilla.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- bugzilla.spec 1 Feb 2010 11:01:52 -0000 1.34
+++ bugzilla.spec 1 Jun 2010 12:14:09 -0000 1.35
@@ -4,7 +4,7 @@
Summary: Bug tracking system
URL: http://www.bugzilla.org/
Name: bugzilla
-Version: 3.4.5
+Version: 3.6
Group: Applications/Publishing
Release: 1%{?dist}
License: MPLv1.1
@@ -12,11 +12,13 @@ Source0: http://ftp.mozilla.org/pub/mozi
Source1: bugzilla-httpd-conf
Source2: README.fedora.bugzilla
Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-graphs-dir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), perl(Digest::SHA), which
+Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), which
Requires: perl(CGI) >= 3.33
+Requires: perl(Digest::SHA)
Requires: perl(Date::Format) >= 2.21
Requires: perl(DateTime) >= 0.28
Requires: perl(DateTime::TimeZone) >= 0.71
@@ -26,6 +28,7 @@ Requires: perl(Email::Send) >= 2.00
Requires: perl(Email::MIME) >= 1.861
Requires: perl(Email::MIME::Encodings) >= 1.313
Requires: perl(Email::MIME::Modifier) >= 1.442
+Requires: perl(URI)
%package doc
Summary: Bugzilla documentation
@@ -58,6 +61,10 @@ Contributed scripts and functions for Bu
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
+%patch1 -p0
+rm -f Bugzilla/Constants.pm.orig
+# Remove bundled libs
+rm -rf lib
# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
# create a wrapper script which runs the original perl_requires
@@ -65,13 +72,28 @@ Contributed scripts and functions for Bu
cat << \EOF > %{name}-req
#!/bin/sh
%{__perl_requires} $* |\
-sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d'
+sed -e '/perl(Authen::Radius)/d;/perl(DBD::Pg)/d;/perl(DBD::Oracle)/d;/perl(sanitycheck.cgi)/d' |\
+sed -e '/perl(Apache2::Const)/d;/perl(Apache2::ServerUtil)/d;/perl(ModPerl::RegistryLoader)/d' |\
+sed -e '/perl(CPAN)/d;/perl(Net::LDAP)/d;/perl(Email::Reply)/d' |\
+sed -e '/perl(Email::MIME::Attachment::Stripper)/d;/perl(Email::MIME::Modifier)/d' |\
+sed -e '/perl(Image::Magick)/d;/perl(Test::Harness)/d;/perl(Test::Taint)/d' |\
+sed -e '/perl(XML::Twig)/d;/perl(XMLRPC::Lite)/d;/perl(XMLRPC::Transport::HTTP)/d'
EOF
# use that wrapper script instead of the original perl_requires script
%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req
chmod +x %{__perl_requires}
+# Filter unwanted provides
+cat << \EOF > %{name}-prov
+#!/bin/sh
+%{__perl_provides} $* |\
+sed -e '/perl(Bugzilla::Extension::BmpConvert)/d;perl(Bugzilla::Extension::Example)/d'
+EOF
+
+%global __perl_provides %{_builddir}/%{name}-%{version}/%{name}-prov
+chmod +x %{__perl_provides}
+
# 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
@@ -129,16 +151,16 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/bugzilla.dtd
%{bzinstallprefix}/bugzilla/robots.txt
%{bzinstallprefix}/bugzilla/Bugzilla
+%{bzinstallprefix}/bugzilla/extensions
%{bzinstallprefix}/bugzilla/images
%{bzinstallprefix}/bugzilla/js
%{bzinstallprefix}/bugzilla/skins
%{bzinstallprefix}/bugzilla/t
%{bzinstallprefix}/bugzilla/template
-%{bzinstallprefix}/bugzilla/extensions/example
-%{bzinstallprefix}/bugzilla/lib/README
%{bzinstallprefix}/bugzilla/cron.daily
%{bzinstallprefix}/bugzilla/cron.whine
%ghost %{bzinstallprefix}/bugzilla/bugzilla-req
+%ghost %{bzinstallprefix}/bugzilla/bugzilla-prov
%config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
%defattr(-,root,root,-)
%doc README
@@ -163,6 +185,10 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/contrib
%changelog
+* Tue Apr 13 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6-1
+- Update to 3.6 (#598377)
+- Patch to put graphs in /var/lib/bugzilla/ (brc #564450, bmo #313739)
+
* Mon Feb 01 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4.5-1
- Update to 3.4.5 (CVE-2009-3989, CVE-2009-3387)
- Remove bugzilla-EL5-perl-versions.patch which is EPEL-specific
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources 1 Feb 2010 11:01:52 -0000 1.18
+++ sources 1 Jun 2010 12:14:09 -0000 1.19
@@ -1 +1 @@
-42c7f6bf31be3198cbf1f55fffaff441 bugzilla-3.4.5.tar.gz
+9c0210131ca9915526f63c84030463e1 bugzilla-3.6.tar.gz
More information about the scm-commits
mailing list