OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Feb-2008 19:55:19
Branch: HEAD Handle: 2008022918551900
Modified files:
openpkg-src/drupal drupal.spec rc.drupal
Log:
disable the manual cron job in case dcron is used
Summary:
Revision Changes Path
1.146 +6 -0 openpkg-src/drupal/drupal.spec
1.3 +1 -1 openpkg-src/drupal/rc.drupal
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.145 -r1.146 drupal.spec
--- openpkg-src/drupal/drupal.spec 29 Feb 2008 18:52:02 -0000 1.145
+++ openpkg-src/drupal/drupal.spec 29 Feb 2008 18:55:19 -0000 1.146
@@ -856,7 +856,13 @@
$RPM_BUILD_ROOT%{l_prefix}/share/drupal/sites/default/
# install run-command script
+%if "%{with_dcron}" == "yes"
+ l_drupal_cron="no"
+%else
+ l_drupal_cron="yes"
+%endif
%{l_shtool} install -c -m 755 %{l_value -s -a} \
+ -e "s;@l_drupal_cron@;$l_drupal_cron;g" \
%{SOURCE rc.drupal} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# install database setup script
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/rc.drupal
============================================================================
$ cvs diff -u -r1.2 -r1.3 rc.drupal
--- openpkg-src/drupal/rc.drupal 25 Aug 2006 19:16:19 -0000 1.2
+++ openpkg-src/drupal/rc.drupal 29 Feb 2008 18:55:19 -0000 1.3
@@ -5,7 +5,7 @@
%config
drupal_enable="$openpkg_rc_def"
- drupal_cron="yes"
+ drupal_cron="@l_drupal_cron@"
%status -u @l_susr@ -o
drupal_usable="no"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
