[bugzilla] Update to 4.0

Emmanuel Seyman eseyman at fedoraproject.org
Sun Mar 27 22:19:06 UTC 2011 

commit 3e499de79c3bda371e7771c69f6a00696fc276e3
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Mon Mar 28 00:18:56 2011 +0200

    Update to 4.0

 .gitignore          |    1 +
 bugzilla.cron-daily |    6 ++++
 bugzilla.spec       |   73 ++++++++++++++++++++++++++++++++-------------------
 sources             |    2 +-
 4 files changed, 54 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e40fcb6..e363e9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-3.6.2.tar.gz
 /bugzilla-3.6.3.tar.gz
 /bugzilla-3.6.4.tar.gz
+/bugzilla-4.0-1.fc14.src.rpm
diff --git a/bugzilla.cron-daily b/bugzilla.cron-daily
new file mode 100644
index 0000000..095c646
--- /dev/null
+++ b/bugzilla.cron-daily
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Daily Bugzilla collectstats cron job run
+
+cd /usr/share/bugzilla
+./collectstats.pl
+
diff --git a/bugzilla.spec b/bugzilla.spec
index a290285..8e32647 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,30 +4,29 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.6.4
+Version: 4.0
 Group: Applications/Publishing
-Release: 7%{?dist}
+Release: 1%{?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
+Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: webserver, patchutils, perl(SOAP::Lite), which
 Requires: perl(CGI) >= 3.51
+Requires: perl(Digest::SHA)
 Requires: perl(Date::Format) >= 2.21
 Requires: perl(DateTime) >= 0.28
 Requires: perl(DateTime::TimeZone) >= 0.71
 Requires: perl(DBI) >= 1.41
-Requires: perl(Digest::SHA)
-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(Template) >= 2.22
+Requires: perl(Email::Send) >= 2.00
+Requires: perl(Email::MIME) >= 1.904
 Requires: perl(URI)
+Requires: perl(List::MoreUtils) >= 0.22
 
 %package doc
 Summary: Bugzilla documentation
@@ -43,16 +42,34 @@ Group: Applications/Publishing
 BuildRequires: python
 
 # Remove all optional modules from the requires stream
-%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBI::db)/d;
-%filter_from_requires /perl(DBD::Oracle)/d; /perl(DBI::st)/d;
-%filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d;
-%filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d;
-%filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d;
-%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d; /perl(Email::MIME::Modifier)/d;
-%filter_from_requires /perl(Image::Magick)/d; /perl(Test::Harness)/d; /perl(Test::Taint)/d;
-%filter_from_requires /perl(XML::Twig)/d; /perl(XMLRPC::Lite)/d; /perl(XMLRPC::Transport::HTTP)/d;
-
-# Remove extensions from the provides stream
+
+%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;
+
+# authentification modules
+%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;
+
+# inbound email modules
+%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;
+
+# 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;
+
+# extension modules
+%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_setup
@@ -90,13 +107,13 @@ find . -depth -name CVS -type d -exec rm -rf {} \;
 find . -depth -name .cvsignore -type f -exec rm -rf {} \;
 # Remove the execute bit from files that don't start with #!
 for file in `find -type f -perm /111`; do
-  if head -1 $file | egrep -v '^\#!' &>/dev/null; then
+  if head -1 $file | grep -E -v '^\#!' &>/dev/null; then
     chmod a-x $file
   fi
 done
 # Ensure shebang shell scripts have executable bit set
 for file in `find -type f -perm /664`; do
-  if head -1 $file | egrep '^\#!' &>/dev/null; then
+  if head -1 $file | grep -E '^\#!' &>/dev/null; then
     chmod a+x $file
   fi
 done
@@ -105,12 +122,6 @@ done
 %install
 mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
 cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
-cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily
-#!/bin/bash
-# Daily Bugzilla collectstats cron job run
-cd %{bzinstallprefix}/bugzilla
-./collectstats.pl
-EOM
 echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.whine
 rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,UPGRADING,UPGRADING-pre-2.8}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
@@ -118,6 +129,7 @@ cp %{SOURCE2} ./README.fedora
 mkdir -p ${RPM_BUILD_ROOT}/%{bzdatadir}
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/bugzilla
 install -m 0644 -D -p %{SOURCE1}  ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/bugzilla.conf
+install -m 0755 -D -p %{SOURCE3}  ${RPM_BUILD_ROOT}%{bzinstallprefix}/bugzilla/cron.daily
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -142,6 +154,7 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/lib
 %{bzinstallprefix}/bugzilla/skins
 %{bzinstallprefix}/bugzilla/t
+%{bzinstallprefix}/bugzilla/xt
 %{bzinstallprefix}/bugzilla/template
 %{bzinstallprefix}/bugzilla/cron.daily
 %{bzinstallprefix}/bugzilla/cron.whine
@@ -168,18 +181,21 @@ popd > /dev/null)
 %files contrib
 %defattr(-,root,root,-)
 %{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb
-%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue
+%{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
 %{bzinstallprefix}/bugzilla/contrib/console.pl
+%{bzinstallprefix}/bugzilla/contrib/convert-workflow.pl
 %{bzinstallprefix}/bugzilla/contrib/cvs-update.pl
 %{bzinstallprefix}/bugzilla/contrib/extension-convert.pl
 %{bzinstallprefix}/bugzilla/contrib/fixperms.pl
 %{bzinstallprefix}/bugzilla/contrib/jb2bz.py*
 %{bzinstallprefix}/bugzilla/contrib/merge-users.pl
 %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl
+%{bzinstallprefix}/bugzilla/contrib/new-yui.sh
 %{bzinstallprefix}/bugzilla/contrib/README
 %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl
 %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl
@@ -187,6 +203,9 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh
 
 %changelog
+* Sun Mar 27 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 4.0-1
+- Update to 4.0
+
 * Sun Mar 06 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-7
 - Put contrib/recode.pl in the main package so that it no longer depends on
   python and ruby
diff --git a/sources b/sources
index ae3a903..282d8f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1bb7980c50c51590d7c2341bc03d5151  bugzilla-3.6.4.tar.gz
+c5f119e869193ae58893f8fc7a0373a2  bugzilla-4.0-1.fc14.src.rpm

More information about the scm-commits mailing list