From 8e698f25d767460fc7f35fb9ca1b277fa32251f0 Mon Sep 17 00:00:00 2001
From: John Berninger <jwb@fedoraproject.org>
Date: Fri, 28 Dec 2007 17:44:02 +0000
Subject: [PATCH] cronjob fix - bz 426465

---
 README.fedora.bugzilla |  9 +++++++++
 bugzilla.spec          | 16 +++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/README.fedora.bugzilla b/README.fedora.bugzilla
index ea9b201..2611a75 100644
--- a/README.fedora.bugzilla
+++ b/README.fedora.bugzilla
@@ -14,3 +14,12 @@ database setting modifications.
 
 Lastly, simply re-run checksetup.pl to populate the database tables, set up
 the templates, and add the administrator ID.  You should be done at this point.
+
+There are two useful cron jobs which are included with Bugzilla which should be
+put in place after configuration is done.  The first is a daily cron job for 
+statistics collection.  This is in the file "cron.daily" and can be enabled by
+simply copying this file to /etc/cron.daily/bugzilla (or any other file name
+in the /etc/cron.daily/ directory).  The second is the "whine" cron job,
+designed to run every 15 minutes.  To enable this job, simply coopy the
+cron.whine file to /etc/cron.d/bugzilla (or any othe filename within the
+/etc/cron.d/ directory).
diff --git a/bugzilla.spec b/bugzilla.spec
index 0f735a0..d757f25 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.0.2
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MPL
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -75,15 +75,13 @@ done
 %install
 mkdir -p ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
 cp -pr * ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily
-cat << EOM > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.daily/bugzilla
+cat << EOM > ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/cron.daily
 #!/bin/bash
 # Daily Bugzilla collectstats cron job run
 cd %{bzinstallprefix}/bugzilla
 ./collectstats.pl
 EOM
-mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d
-echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{_sysconfdir}/cron.d/bugzilla
+echo "0-59/15 * * * * apache cd %{bzinstallprefix}/bugzilla && env LANG=C %{bzinstallprefix}/bugzilla/whine.pl" > ${RPM_BUILD_ROOT}/%{bzintallprefix}/bugzilla/cron.whine
 rm -f ${RPM_BUILD_ROOT}/%{bzinstallprefix}/bugzilla/{README,QUICKSTART,UPGRADING,UPGRADING-pre-2.8}
 mkdir -p ${RPM_BUILD_ROOT}/%{_datadir}/doc/%{name}-%{version}
 cp %{SOURCE2} ./README.fedora
@@ -117,10 +115,6 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/template
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-req
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
-%defattr(0755,root,root,-)
-%{_sysconfdir}/cron.daily/*
-%defattr(0600,root,root,-)
-%{_sysconfdir}/cron.d/*
 %defattr(-,root,root,-)
 %doc README
 %doc QUICKSTART
@@ -137,6 +131,10 @@ popd > /dev/null
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Fri Dec 28 2007 John Berninger <john at ncphotography dot com> - 3.0.2-3
+- bz 426465 - don't enable cron jobs so cron doesn't complain about
+  an unconfigured installation
+
 * Fri Oct 26 2007 John Berninger <john at ncphotography dot com> - 3.0.2-2
 - fix issue with AlowOverride Options