rpms/bugzilla/EL-4 bugzilla-EL5-perl-versions.patch, NONE, 1.1 bugzilla-rw-paths.patch, 1.1, 1.2 bugzilla.spec, 1.13, 1.14 import.log, 1.2, 1.3
Itamar Reis Peixoto
itamarjp at fedoraproject.org
Tue Aug 4 04:33:53 UTC 2009
Author: itamarjp
Update of /cvs/pkgs/rpms/bugzilla/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14248/EL-4
Modified Files:
bugzilla-rw-paths.patch bugzilla.spec import.log
Added Files:
bugzilla-EL5-perl-versions.patch
Log Message:
- fix EL-5 perl dependencies bz#515158
bugzilla-EL5-perl-versions.patch:
Constants.pm | 2 +-
Install/Requirements.pm | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
--- NEW FILE bugzilla-EL5-perl-versions.patch ---
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Constants.pm b/bugzilla-3.2.4/Bugzilla/Constants.pm
--- a/bugzilla-3.2.4/Bugzilla/Constants.pm 2009-07-08 10:58:27.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Constants.pm 2009-08-04 00:37:30.852896189 -0300
@@ -387,7 +387,7 @@ use constant DB_MODULE => {
# Disallow development versions
blacklist => ['_'],
# For UTF-8 support
- version => '4.00',
+ version => '3.00',
},
name => 'MySQL'},
'pg' => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
diff -ruNp a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm
--- a/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm 2009-04-17 18:53:49.000000000 -0300
+++ b/bugzilla-3.2.4/Bugzilla/Install/Requirements.pm 2009-08-04 00:38:23.376893996 -0300
@@ -62,7 +62,7 @@ sub REQUIRED_MODULES {
# Perl 5.10 requires CGI 3.33 due to a taint issue when
# uploading attachments, see bug 416382.
# Require CGI 3.21 for -httponly support, see bug 368502.
- version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.33' : '3.21'
+ version => (vers_cmp($perl_ver, '5.10') > -1) ? '3.15' : '3.15'
},
{
package => 'TimeDate',
@@ -92,7 +92,7 @@ sub REQUIRED_MODULES {
{
package => 'Email-MIME',
module => 'Email::MIME',
- version => '1.861'
+ version => '1.859'
},
{
package => 'Email-MIME-Encodings',
@@ -103,7 +103,7 @@ sub REQUIRED_MODULES {
{
package => 'Email-MIME-Modifier',
module => 'Email::MIME::Modifier',
- version => '1.442'
+ version => '1.441'
},
);
bugzilla-rw-paths.patch:
Constants.pm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: bugzilla-rw-paths.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/bugzilla-rw-paths.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- bugzilla-rw-paths.patch 4 Jul 2009 01:03:28 -0000 1.1
+++ bugzilla-rw-paths.patch 4 Aug 2009 04:33:53 -0000 1.2
@@ -1,6 +1,6 @@
---- bugzilla-3.2.2/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000
-+++ bugzilla-3.2.2-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000
-@@ -465,9 +465,9 @@
+--- bugzilla-3.4/Bugzilla/Constants.pm 2009-02-03 10:02:53.000000000 +0000
++++ bugzilla-3.4-rw/Bugzilla/Constants.pm 2009-02-18 17:59:52.000000000 +0000
+@@ -499,9 +499,9 @@ sub bz_locations {
'cgi_path' => $libpath,
'templatedir' => "$libpath/template",
'project' => $project,
@@ -13,14 +13,12 @@
'skinsdir' => "$libpath/skins",
# $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
-@@ -475,8 +475,8 @@
+@@ -509,7 +509,7 @@ sub bz_locations {
# change showdependencygraph.cgi to set image_url to the correct
# location.
# The script should really generate these graphs directly...
- 'webdotdir' => "$libpath/$datadir/webdot",
-- 'extensionsdir' => "$libpath/extensions",
+ 'webdotdir' => "/var/lib/bugzilla/$datadir/webdot",
-+ 'extensionsdir' => "/var/lib/bugzilla/extensions",
+ 'extensionsdir' => "$libpath/extensions",
};
}
-
Index: bugzilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/bugzilla.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- bugzilla.spec 8 Jul 2009 19:26:00 -0000 1.13
+++ bugzilla.spec 4 Aug 2009 04:33:53 -0000 1.14
@@ -6,12 +6,13 @@ URL: http://www.bugzilla.org/
Name: bugzilla
Version: 3.2.4
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
Source2: README.fedora.bugzilla
Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-EL5-perl-versions.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -41,6 +42,7 @@ Contributed scripts and functions for Bu
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
+%patch1 -p2
# Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
# create a wrapper script which runs the original perl_requires
@@ -143,6 +145,9 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/contrib
%changelog
+* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-2
+- fix EL-5 perl dependencies bz#515158
+
* Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
- fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/bugzilla/EL-4/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 8 Jul 2009 19:26:00 -0000 1.2
+++ import.log 4 Aug 2009 04:33:53 -0000 1.3
@@ -1,2 +1,3 @@
bugzilla-3_2_3-1_fc11:EL-4:bugzilla-3.2.3-1.fc11.src.rpm:1246669340
bugzilla-3_2_4-1_fc11:EL-4:bugzilla-3.2.4-1.fc11.src.rpm:1247081113
+bugzilla-3_2_4-2_fc12:EL-4:bugzilla-3.2.4-2.fc12.src.rpm:1249360380
More information about the scm-commits
mailing list