[bugzilla] Update to 4.0.2, add RPM-4.9-style filtering, put graphs in /var/lib/bugzilla/graphs
Emmanuel Seyman
eseyman at fedoraproject.org
Fri Aug 5 12:40:22 UTC 2011
commit c6fe6692ef4d870ecebf75302384bb595af9476b
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date: Fri Aug 5 14:39:55 2011 +0200
Update to 4.0.2, add RPM-4.9-style filtering, put graphs in /var/lib/bugzilla/graphs
.gitignore | 1 +
bugzilla-rw-paths.patch | 14 +++++---
bugzilla.spec | 79 +++++++++++++++++++++++++++++++++-------------
sources | 2 +-
4 files changed, 66 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9f899a9..1f04fc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ bugzilla-3.6.1.tar.gz
/bugzilla-4.0-1.fc14.src.rpm
/bugzilla-4.0.tar.gz
/bugzilla-4.0.1.tar.gz
+/bugzilla-4.0.2.tar.gz
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
index 44d157a..9c4e2f8 100644
--- a/bugzilla-rw-paths.patch
+++ b/bugzilla-rw-paths.patch
@@ -1,19 +1,21 @@
---- 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
-@@ -539,9 +539,9 @@
+--- bugzilla-4.0.1/Bugzilla/Constants.pm 2011-08-05 12:14:57.301671513 +0200
++++ bugzilla-4.0.1-rw/Bugzilla/Constants.pm 2011-08-05 12:16:51.798741609 +0200
+@@ -605,18 +605,18 @@ sub bz_locations {
'cgi_path' => $libpath,
'templatedir' => "$libpath/template",
'project' => $project,
- 'localconfig' => "$libpath/$localconfig",
- 'datadir' => "$libpath/$datadir",
- 'attachdir' => "$libpath/$datadir/attachments",
-+ 'localconfig' => "/etc/bugzilla/$localconfig",
++ 'localconfig' => "/etc/bugzilla/localconfig",
+ 'datadir' => "/var/lib/bugzilla/$datadir",
+ 'attachdir' => "/var/lib/bugzilla/$datadir/attachments",
'skinsdir' => "$libpath/skins",
- 'graphsdir' => "$libpath/graphs",
+- 'graphsdir' => "$libpath/graphs",
++ 'graphsdir' => "/var/lib/bugzilla/graphs",
# $webdotdir must be in the web server's tree somewhere. Even if you use a
-@@ -550,7 +550,7 @@
+ # local dot, we output images to there. Also, if $webdotdir is
+ # not relative to the bugzilla root directory, you'll need to
# change showdependencygraph.cgi to set image_url to the correct
# location.
# The script should really generate these graphs directly...
diff --git a/bugzilla.spec b/bugzilla.spec
index cd881c4..3739bcc 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,7 +4,7 @@
Summary: Bug tracking system
URL: http://www.bugzilla.org/
Name: bugzilla
-Version: 4.0.1
+Version: 4.0.2
Group: Applications/Publishing
Release: 1%{?dist}
License: MPLv1.1
@@ -42,39 +42,65 @@ Summary: Bugzilla contributed scripts
Group: Applications/Publishing
BuildRequires: python
+# RPM 4.8 style:
+# Filter underspecified dependencies
# Remove all optional modules from the requires stream
-
-%filter_from_requires /perl(sanitycheck.cgi)/d;
-
+%filter_from_requires /perl(sanitycheck.cgi)/d
# mod_perl modules
-%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d;
-%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d;
-
+%filter_from_requires /perl(Apache2::Const)/d; /perl(Apache2::ServerUtil)/d
+%filter_from_requires /perl(Apache2::SizeLimit)/d; /perl(ModPerl::RegistryLoader)/d
# authentification modules
-%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d;
-
+%filter_from_requires /perl(Authen::Radius)/d; /perl(Net::LDAP)/d
# database modules
-%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d;
-%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d;
-
+%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBD::Pg)/d
+%filter_from_requires /perl(DBI::db)/d; /perl(DBI::st)/d
# inbound email modules
-%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d;
-
+%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::Reply)/d
# bug moving modules
-%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d;
-
+%filter_from_requires /perl(MIME::Parser)/d; /perl(XML::Twig)/d
# xml-rpc and json-rpc modules
-%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d;
-%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d;
-
+%filter_from_requires /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d
+%filter_from_requires /perl(HTTP::Message)/d; /perl(Test::Taint)/d
# extension modules
-%filter_from_requires /perl(Image::Magick)/d;
-
+%filter_from_requires /perl(Image::Magick)/d
# and remove the extensions from the provides stream
-%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d;
-
+%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d
%filter_setup
+# RPM 4.9 style:
+# Filter underspecified dependencies
+# Remove all optional modules from the requires stream
+%global __requires_exclude %__requires_exclude|^perl\\(sanitycheck.cgi\\)$
+# mod_perl modules
+%global __requires_exclude %__requires_exclude|^perl\\(Apache2::Const\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Apache2::ServerUtil\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Apache2::SizeLimit\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(ModPerl::RegistryLoader\\)$
+# authentification modules
+%global __requires_exclude %__requires_exclude|^perl\\(Authen::Radius\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Net::LDAP\\)$
+# database modules
+%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\\)$
+# inbound email modules
+%global __requires_exclude %__requires_exclude|^perl\\(Email::MIME::Attachment::Stripper\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Email::Reply\\)$
+# bug moving modules
+%global __requires_exclude %__requires_exclude|^perl\\(MIME::Parser\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(XML::Twig\\)$
+# xml-rpc and json-rpc modules
+%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Lite\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(XMLRPC::Transport::HTTP\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(HTTP::Message\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Test::Taint\\)$
+# extension modules
+%global __requires_exclude %__requires_exclude|^perl\\(Image::Magick\\)$
+# and remove the extensions from the provides stream
+%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::BmpConvert\\)$
+%global __requires_exclude %__requires_exclude|^perl\\(Bugzilla::Extension::Example\\)$
+
%description
Bugzilla is a popular bug tracking system used by multiple open source projects
It requires a database engine installed - either MySQL, PostgreSQL or Oracle.
@@ -205,6 +231,11 @@ popd > /dev/null)
%{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh
%changelog
+* Fri Aug 05 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 4.0.2-1
+- Update to 4.0.2
+- Add RPM-4.9-style filtering
+- Put graphs in /var/lib/bugzilla/graphs.
+
* Sun May 01 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 4.0.1-1
- Update to 4.0.1
- Patch the installation procedure to recommend yum
@@ -235,6 +266,8 @@ popd > /dev/null)
* Tue Jan 25 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-1
- Update to 3.6.4
+- Add RPM-4.9-style filtering
+-
* Wed Nov 03 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.3-1
- Update to 3.6.3 (#649406)
diff --git a/sources b/sources
index 031f4e5..6a4140d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2785598c9787f3fe2edad97360c36306 bugzilla-4.0.1.tar.gz
+1244a7a477682ecc9caadf840d960d2e bugzilla-4.0.2.tar.gz
More information about the scm-commits
mailing list