packages: drupal/drupal-cron.patch, drupal/drupal-sitesdir.patch, drupal/dr...

glen glen at pld-linux.org
Tue May 4 17:14:01 CEST 2010 

Author: glen                         Date: Tue May  4 15:14:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged 5.7 from DEVEL: cvs up -j HEAD -j DEVEL, except manually re-merged changelog section

---- Files affected:
packages/drupal:
   drupal-cron.patch (1.5 -> 1.6) , drupal-sitesdir.patch (1.2 -> 1.3) , drupal-themedir2.patch (1.1 -> 1.2) , drupal-topdir.patch (1.4 -> 1.5) , drupal.conf (1.15 -> 1.16) , drupal.cron (1.3 -> 1.4) , drupal.spec (1.78 -> 1.79) , drupal-apache1.conf (1.1 -> 1.2) , drupal-19298-cache.patch (1.2 -> NONE)  (REMOVED), drupal-comment.patch (1.1 -> NONE)  (REMOVED), drupal-disabled_fields.patch (1.1 -> NONE)  (REMOVED), drupal-emptypass.patch (1.4 -> NONE)  (REMOVED), drupal-http-reject.patch (1.1 -> NONE)  (REMOVED), drupal-locale-memory.patch (1.1 -> NONE)  (REMOVED), drupal-replication.patch (1.5 -> NONE)  (REMOVED), drupal-update-cli.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/drupal/drupal-cron.patch
diff -u packages/drupal/drupal-cron.patch:1.5 packages/drupal/drupal-cron.patch:1.6
--- packages/drupal/drupal-cron.patch:1.5	Tue Jan 30 17:04:28 2007
+++ packages/drupal/drupal-cron.patch	Tue May  4 17:13:55 2010
@@ -1,27 +1,6 @@
---- ./includes/bootstrap.inc	2005-10-11 10:02:05.000000000 +0300
-+++ /tmp/bootstrap.inc	2005-10-11 10:01:51.000000000 +0300
-@@ -50,7 +50,7 @@
- 
-   $confdir = '/etc/drupal/sites';
-   $uri = explode('/', $_SERVER['PHP_SELF']);
--  $server = explode('.', rtrim($_SERVER['HTTP_HOST'], '.'));
-+  $server = explode('.', rtrim(@$_SERVER['HTTP_HOST'], '.'));
-   for ($i = count($uri) - 1; $i > 0; $i--) {
-     for ($j = count($server); $j > 0; $j--) {
-       $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
---- ./includes/session.inc	2005-08-10 23:43:03.000000000 +0300
-+++ /tmp/session.inc	2005-10-11 10:03:38.000000000 +0300
-@@ -25,7 +25,7 @@
-   $result = db_query_range("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s' AND u.status < 3", $key, 0, 1);
- 
-   if (!db_num_rows($result)) {
--    db_query("INSERT INTO {sessions} (sid, uid, hostname, timestamp) VALUES ('%s', 0, '%s', %d)", $key, $_SERVER["REMOTE_ADDR"], time());
-+    db_query("INSERT INTO {sessions} (sid, uid, hostname, timestamp) VALUES ('%s', 0, '%s', %d)", $key, @$_SERVER["REMOTE_ADDR"], time());
-     $result = db_query("SELECT u.* FROM {users} u WHERE u.uid = 0");
-   }
- 
---- ./cron.php	2005-12-09 20:13:27.000000000 +0200
-+++ drupal-4.6.11/cron.php	2007-01-30 18:02:41.911795649 +0200
+diff -uNdr drupal-5.7.old/cron.php drupal-5.7/cron.php
+--- drupal-5.7.old/cron.php	2006-08-09 09:42:55.000000000 +0200
++++ drupal-5.7/cron.php	2008-02-16 15:50:48.000000000 +0100
 @@ -1,3 +1,4 @@
 +#!/usr/bin/php
  <?php
@@ -38,6 +17,45 @@
 +
 +chdir(dirname(__FILE__));
 +
- include_once 'includes/bootstrap.inc';
- include_once 'includes/common.inc' ;
- 
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ drupal_cron_run();
+diff -uNdr drupal-5.7.old/includes/bootstrap.inc drupal-5.7/includes/bootstrap.inc
+--- drupal-5.7.old/includes/bootstrap.inc	2008-01-10 23:14:24.000000000 +0100
++++ drupal-5.7/includes/bootstrap.inc	2008-02-16 16:02:23.000000000 +0100
+@@ -201,7 +201,7 @@
+ 
+   $confdir = 'sites';
+   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+-  $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
++  $server = explode('.', implode('.', array_reverse(explode(':', rtrim(@$_SERVER['HTTP_HOST'], '.')))));
+   for ($i = count($uri) - 1; $i > 0; $i--) {
+     for ($j = count($server); $j > 0; $j--) {
+       $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
+@@ -240,7 +240,7 @@
+   global $db_url, $db_prefix, $cookie_domain, $conf, $installed_profile;
+   $conf = array();
+ 
+-  include_once './'. conf_path() .'/settings.php';
++  include_once conf_path() .'/settings.php';
+ 
+   if (isset($base_url)) {
+     // Parse fixed base URL from settings.php.
+@@ -258,7 +258,7 @@
+ 
+     // As $_SERVER['HTTP_HOST'] is user input, ensure it only contains
+     // characters allowed in hostnames.
+-    $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '', $_SERVER['HTTP_HOST']);
++    $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '', @$_SERVER['HTTP_HOST']);
+ 
+     // $_SERVER['SCRIPT_NAME'] can, in contrast to $_SERVER['PHP_SELF'], not
+     // be modified by a visitor.
+@@ -886,7 +886,7 @@
+ 
+     case DRUPAL_BOOTSTRAP_ACCESS:
+       // Deny access to hosts which were banned - t() is not yet available.
+-      if (drupal_is_denied('host', $_SERVER['REMOTE_ADDR'])) {
++      if (drupal_is_denied('host', @$_SERVER['REMOTE_ADDR'])) {
+         header('HTTP/1.1 403 Forbidden');
+         print 'Sorry, '. $_SERVER['REMOTE_ADDR']. ' has been banned.';
+         exit();

================================================================
Index: packages/drupal/drupal-sitesdir.patch
diff -u packages/drupal/drupal-sitesdir.patch:1.2 packages/drupal/drupal-sitesdir.patch:1.3
--- packages/drupal/drupal-sitesdir.patch:1.2	Mon Dec  5 13:03:07 2005
+++ packages/drupal/drupal-sitesdir.patch	Tue May  4 17:13:55 2010
@@ -1,12 +1,12 @@
-diff -ur ./includes/bootstrap.inc ../drupal1/includes/bootstrap.inc
---- ./includes/bootstrap.inc	2005-04-05 22:00:24.000000000 +0300
-+++ ./drupal1/includes/bootstrap.inc	2005-05-19 18:20:06.845355509 +0300
-@@ -48,7 +48,7 @@
+diff -uNdr drupal-5.7.old1/includes/bootstrap.inc drupal-5.7/includes/bootstrap.inc
+--- drupal-5.7.old1/includes/bootstrap.inc	2008-02-16 16:02:23.000000000 +0100
++++ drupal-5.7/includes/bootstrap.inc	2008-02-16 16:06:30.000000000 +0100
+@@ -199,7 +199,7 @@
      return $conf;
    }
  
 -  $confdir = 'sites';
 +  $confdir = '/etc/webapps/drupal/sites';
-   $uri = explode('/', $_SERVER['PHP_SELF']);
-   $server = explode('.', rtrim($_SERVER['HTTP_HOST'], '.'));
+   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']);
+   $server = explode('.', implode('.', array_reverse(explode(':', rtrim(@$_SERVER['HTTP_HOST'], '.')))));
    for ($i = count($uri) - 1; $i > 0; $i--) {

================================================================
Index: packages/drupal/drupal-themedir2.patch
diff -u packages/drupal/drupal-themedir2.patch:1.1 packages/drupal/drupal-themedir2.patch:1.2
--- packages/drupal/drupal-themedir2.patch:1.1	Wed Jul  6 17:45:28 2005
+++ packages/drupal/drupal-themedir2.patch	Tue May  4 17:13:55 2010
@@ -1,11 +1,10 @@
---- ../includes/theme.inc	2005-05-20 16:55:04.000000000 +0300
-+++ /tmp/theme.inc	2005-05-21 15:10:45.000000000 +0300
-@@ -74,7 +74,7 @@
-   else {
+--- drupal-5.0/includes/theme.inc~	2007-01-26 13:09:14.801730081 +0200
++++ drupal-5.0/includes/theme.inc	2007-01-26 13:09:52.242575644 +0200
+@@ -65,6 +65,6 @@
      // File is a template/theme
      // Load its CSS, if it exists
 -    if (file_exists($stylesheet = dirname($themes[$theme]->filename) .'/style.css')) {
 +    if (file_exists('htdocs/' . ($stylesheet = dirname($themes[$theme]->filename) .'/style.css'))) {
-       theme_add_style($stylesheet);
+       drupal_add_css($stylesheet, 'theme');
      }
    }

================================================================
Index: packages/drupal/drupal-topdir.patch
diff -u packages/drupal/drupal-topdir.patch:1.4 packages/drupal/drupal-topdir.patch:1.5
--- packages/drupal/drupal-topdir.patch:1.4	Wed Jan 11 20:35:58 2006
+++ packages/drupal/drupal-topdir.patch	Tue May  4 17:13:55 2010
@@ -1,20 +1,30 @@
---- ./index.php~	2004-08-21 09:42:34.000000000 +0300
-+++ ./index.php	2005-05-20 14:10:24.260339523 +0300
+--- drupal-5.0/index.php~	2007-01-26 13:07:22.769199912 +0200
++++ drupal-5.0/index.php	2007-01-26 13:07:59.610031940 +0200
 @@ -9,6 +9,7 @@
   * prints the appropriate page.
   */
  
 +chdir('..');
- include_once 'includes/bootstrap.inc';
- drupal_page_header();
- include_once 'includes/common.inc';
---- drupal-4.6.2/xmlrpc.php~	2004-08-21 09:42:34.000000000 +0300
-+++ drupal-4.6.2/xmlrpc.php	2005-07-06 18:44:26.000000000 +0300
+ require_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ 
+--- drupal-5.0/xmlrpc.php~	2007-01-26 13:08:33.010786268 +0200
++++ drupal-5.0/xmlrpc.php	2007-01-26 13:08:53.461248124 +0200
 @@ -6,6 +6,7 @@
   * PHP page for handling incoming XML-RPC requests from clients.
   */
  
 +chdir('..');
- include_once 'includes/bootstrap.inc';
- include_once 'includes/common.inc';
- include_once 'includes/xmlrpc.inc';
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ include_once './includes/xmlrpc.inc';
+--- drupal-5.7/update.php.old	2007-04-08 02:54:04.000000000 +0200
++++ drupal-5.7/update.php	2008-02-17 21:15:36.000000000 +0100
+@@ -765,6 +765,7 @@
+ // Our custom error handler is not yet installed, so we just suppress them.
+ ini_set('display_errors', FALSE);
+ 
++chdir('..');
+ include_once './includes/bootstrap.inc';
+ update_fix_system_table();
+ 

================================================================
Index: packages/drupal/drupal.conf
diff -u packages/drupal/drupal.conf:1.15 packages/drupal/drupal.conf:1.16
--- packages/drupal/drupal.conf:1.15	Fri Jun  2 14:05:12 2006
+++ packages/drupal/drupal.conf	Tue May  4 17:13:55 2010
@@ -9,8 +9,10 @@
 <Directory /usr/share/drupal/htdocs>
     Options FollowSymLinks
     AllowOverride None
-    Order allow,deny
-    Allow from all
+    <IfModule mod_access.c>
+        order allow,deny
+        allow from all
+    </IfModule>
 
     # Set the default handler.
     <IfModule mod_dir.c>
@@ -91,12 +93,7 @@
 #</Location>
 
 <Directory /var/lib/drupal>
-    Allow from all
-    SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-    Options None
-    <IfModule mod_rewrite.c>
-        RewriteEngine off
-    </IfModule>
+    allow from all
 </Directory>
 
 <VirtualHost *:80>
@@ -108,3 +105,5 @@
         Alias /files /var/lib/drupal
     </IfModule>
 </VirtualHost>
+
+# vim: filetype=apache ts=4 sw=4 et

================================================================
Index: packages/drupal/drupal.cron
diff -u packages/drupal/drupal.cron:1.3 packages/drupal/drupal.cron:1.4
--- packages/drupal/drupal.cron:1.3	Tue Jan 30 17:05:37 2007
+++ packages/drupal/drupal.cron	Tue May  4 17:13:55 2010
@@ -2,6 +2,6 @@
 # bounce messages back to root
 MAILTO=root
 
-0 * * * * http /usr/share/drupal/cron.php
+0 * * * * http cd /usr/share/drupal && /usr/bin/php cron.php
 
 # vim:syn=crontab

================================================================
Index: packages/drupal/drupal.spec
diff -u packages/drupal/drupal.spec:1.78 packages/drupal/drupal.spec:1.79
--- packages/drupal/drupal.spec:1.78	Fri Sep 14 17:01:07 2007
+++ packages/drupal/drupal.spec	Tue May  4 17:13:55 2010
@@ -1,54 +1,40 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_with	ugly_patch		# enable ugly patch. don't use it ;)
-#
-%define		_ver		4.6
-%define		_patchlevel	11
-%define		_rel	4
+# TODO
+# - why not drupal 6.0?
 Summary:	Open source content management platform
-Summary(pl.UTF-8):	Platforma do zarządzania treścią o otwartych źródłach
+Summary(pl.UTF-8):   Platforma do zarządzania treścią o otwartych źródłach
 Name:		drupal
-Version:	%{_ver}.%{_patchlevel}
-Release:	%{_rel}%{?with_ugly_patch:p}
+Version:	5.7
+Release:	0.4
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
-# Source0-md5:	cfa5777fb6a612addcee75dad132909e
+Source0:	http://ftp.osuosl.org/pub/drupal/files/projects/%{name}-%{version}.tar.gz
+# Source0-md5:	c7d9911ad1001c790bbdfe6fd4cdfc89
 Source1:	%{name}.conf
 Source2:	%{name}.cron
 Source3:	%{name}.PLD
-Patch0:		%{name}-replication.patch
+Source4:	%{name}-apache1.conf
+Patch0:		%{name}-cron.patch
 Patch1:		%{name}-sitesdir.patch
 Patch2:		%{name}-topdir.patch
 Patch3:		%{name}-themedir2.patch
-Patch4:		%{name}-emptypass.patch
-Patch5:		%{name}-cron.patch
-Patch6:		%{name}-19298-cache.patch
-Patch7:		%{name}-update-cli.patch
-Patch8:		%{name}-locale-memory.patch
-Patch9:		%{name}-comment.patch
-Patch10:	%{name}-disabled_fields.patch
-Patch11:	%{name}-http-reject.patch
+#Patchx:	%{name}-replication.patch
+#Patchx:	%{name}-emptypass.patch
 URL:		http://drupal.org/
 BuildRequires:	rpmbuild(macros) >= 1.264
 BuildRequires:	sed >= 4.0
 Requires:	%{name}(DB_Driver) = %{version}-%{release}
-Requires:	%{name}(theme) = %{_ver}
-Requires:	/usr/bin/php
 Requires:	apache(mod_access)
 Requires:	apache(mod_alias)
 Requires:	apache(mod_dir)
 Requires:	apache(mod_expires)
 Requires:	apache(mod_rewrite)
-Requires:	php(mysql)
+Requires:	php(mbstring)
 Requires:	php(pcre)
 Requires:	php(xml)
 Requires:	webapps
 Requires:	webserver = apache
 Requires:	webserver(php) >= 4.3.3
-Provides:	%{name} = %{_ver}
-Obsoletes:	drupal-update
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -105,10 +91,11 @@
 
 %package cron
 Summary:	Drupal cron
-Summary(pl.UTF-8):	Usługa cron dla Drupala
+Summary(pl.UTF-8):   Usługa cron dla Drupala
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 Requires:	crondaemon
+Requires:	php-cli >= 3:4.3.3
 
 %description cron
 This package contains script which invokes cron hooks for Drupal.
@@ -118,7 +105,7 @@
 
 %package db-mysql
 Summary:	Drupal DB Driver for MySQL
-Summary(pl.UTF-8):	Sterownik bazy danych MySQL dla Drupala
+Summary(pl.UTF-8):   Sterownik bazy danych MySQL dla Drupala
 Group:		Applications/WWW
 Requires:	php(mysql)
 Provides:	%{name}(DB_Driver) = %{version}-%{release}
@@ -131,7 +118,7 @@
 
 %package db-pgsql
 Summary:	Drupal DB Driver for PostgreSQL
-Summary(pl.UTF-8):	Sterownik bazy danych PostgreSQL dla Drupala
+Summary(pl.UTF-8):   Sterownik bazy danych PostgreSQL dla Drupala
 Group:		Applications/WWW
 Requires:	php(pgsql)
 Provides:	%{name}(DB_Driver) = %{version}-%{release}
@@ -150,22 +137,17 @@
 mają schematy bazy danych dla PostgreSQL-a. Można go używać na własne
 ryzyko.
 
-%package themes
-Summary:	Themes distributed with Drupal
-Summary(pl.UTF-8):	Motywy rozprowadzane z Drupalem
+%package update
+Summary:	Package to perform Drupal database updates
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
-Provides:	drupal(theme) = %{_ver}
-
-%description themes
-This package contains themes distributed with Drupal.
 
-%description themes -l pl.UTF-8
-Ten pakiet zawiera motywy rozprowadzane z Drupalem.
+%description update
+This package contains scripts needed to do database updates via web.
 
 %package xmlrpc
 Summary:	XMLRPC server for Drupal
-Summary(pl.UTF-8):	Serwer XMLRPC dla Drupala
+Summary(pl.UTF-8):   Serwer XMLRPC dla Drupala
 Group:		Applications/WWW
 Requires:	%{name} = %{version}-%{release}
 
@@ -180,61 +162,48 @@
 nazywane rozproszonym uwierzytelnianiem.
 
 %prep
-%setup -q
+%setup -q %{?_rc:-n %{name}-%{version}-%{_rc}}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_ugly_patch:%patch10 -p1}
-%{?with_ugly_patch:%patch11 -p1}
 
+# cleanup backups after patching
+find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 cp -p %{SOURCE3} README.PLD
 
-# remove backups from patching as we use globs to package files to buildroot
-find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/cron.d,/var/{cache,lib}/%{name}} \
-	$RPM_BUILD_ROOT%{_appdir}/{po,database,modules/po,htdocs/modules}
+	$RPM_BUILD_ROOT%{_appdir}/{po,database,modules/po,htdocs/modules,themes}
 
-cp -a *.ico index.php $RPM_BUILD_ROOT%{_appdir}/htdocs
+cp -a index.php $RPM_BUILD_ROOT%{_appdir}/htdocs
 cp -a misc $RPM_BUILD_ROOT%{_appdir}/htdocs
-cp -a xmlrpc.php $RPM_BUILD_ROOT%{_appdir}/htdocs
-cp -a database/updates.inc $RPM_BUILD_ROOT%{_appdir}/database
+cp -a install.php update.php xmlrpc.php $RPM_BUILD_ROOT%{_appdir}/htdocs
 
-cp -a update.php $RPM_BUILD_ROOT%{_appdir}
-install cron.php $RPM_BUILD_ROOT%{_appdir}
-cp -a modules/* $RPM_BUILD_ROOT%{_appdir}/modules
+cp -a cron.php $RPM_BUILD_ROOT%{_appdir}
 cp -a includes scripts $RPM_BUILD_ROOT%{_appdir}
 cp -a sites $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a modules/* $RPM_BUILD_ROOT%{_appdir}/modules
+cp -a themes/* $RPM_BUILD_ROOT%{_appdir}/themes
+cp -Rl $RPM_BUILD_ROOT%{_appdir}/modules $RPM_BUILD_ROOT%{_appdir}/htdocs
+cp -Rl $RPM_BUILD_ROOT%{_appdir}/themes $RPM_BUILD_ROOT%{_appdir}/htdocs
+
+find $RPM_BUILD_ROOT%{_appdir}/htdocs/themes/ $RPM_BUILD_ROOT%{_appdir}/htdocs/modules/ \
+  -type f -regextype posix-awk \
+  -regex '.*\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|php|xtmpl)$|.*/(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$' \
+  -print0 | xargs -0 -r -l512 rm -f
+find $RPM_BUILD_ROOT%{_appdir}/themes/ $RPM_BUILD_ROOT%{_appdir}/modules/ \
+  -type f -regextype posix-awk \
+  ! -regex '.*\.(engine|inc|info|install|module|profile|po|sh|.*sql|theme|php|xtmpl)$|.*/(code-style\.pl|Entries.*|Repository|Root|Tag|Template)$' \
+  -print0 | xargs -0 -r -l512 rm -f
 
-ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
-# needed for node.module for syndication icon
-ln -s htdocs/misc $RPM_BUILD_ROOT%{_appdir}
+# avoid pulling perl dep
+chmod -x $RPM_BUILD_ROOT%{_appdir}/scripts/*
 
-# install themes
-cp -a themes $RPM_BUILD_ROOT%{_appdir}/htdocs
-# move .xtmpl/.theme out of htdocs
-(cd $RPM_BUILD_ROOT%{_appdir}/htdocs && tar cf - --remove-files themes/*/*.{xtmpl,theme}) | tar -xf - -C $RPM_BUILD_ROOT%{_appdir}
-mv $RPM_BUILD_ROOT%{_appdir}/{htdocs/,}themes/engines
-# make screenshot.png available in appdir
-for a in $RPM_BUILD_ROOT%{_appdir}/htdocs/themes/*; do
-	t=$(basename $a)
-	ln -s ../../htdocs/themes/$t/screenshot.png $RPM_BUILD_ROOT%{_appdir}/themes/$t
-done
-
-# a hack
-s=themes/chameleon/marvin
-ln -s ../../htdocs/$s $RPM_BUILD_ROOT%{_appdir}/$s
+ln -s /var/lib/%{name} $RPM_BUILD_ROOT%{_appdir}/files
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
@@ -242,19 +211,22 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-# Perform database updates
-echo 'Performing Drupal database updates'
-cd %{_appdir} && %{_bindir}/php update.php Update
-echo 'Done'
+if [ "$1" = 1 ]; then
+%banner -e %{name} <<'EOF'
+If this is your first install of Drupal, You need at least configure
+$db_url and $base_url in %{_sysconfdir}/sites/default/settings.php
+
+EOF
+fi
 
 %post db-mysql
 if [ "$1" = 1 ]; then
-%banner -e %{name}-db-mysql <<EOF
+%banner -e %{name}-db-mysql <<'EOF'
 If this is your first install of Drupal, you need to create Drupal database:
 
 mysqladmin create drupal
 zcat %{_docdir}/%{name}-db-mysql-%{version}/database.mysql.gz | mysql drupal
-mysql -e "GRANT SELECT, INSERT, UPDATE, DELETE ON drupal.* TO 'drupal'@'localhost' IDENTIFIED BY 'PASSWORD'"
+mysql -e "GRANT SELECT, INSERT, UPDATE, DELETE ON drupal.* TO 'drupal'@'localhost' IDENTIFIED BY 'password'"
 mysql -e "GRANT CREATE TEMPORARY TABLES, LOCK TABLES ON *.* TO 'drupal'@'localhost'"
 
 EOF
@@ -262,7 +234,7 @@
 
 %post db-pgsql
 if [ "$1" = 1 ]; then
-%banner -e %{name}-db-pgsql <<EOF
+%banner -e %{name}-db-pgsql <<'EOF'
 If this is your first install of Drupal, you need to create Drupal database:
 
 and import initial schema from
@@ -271,16 +243,16 @@
 EOF
 fi
 
-%triggerin -- apache1 < 1.3.37-3, apache1-base
+%triggerin -- apache1
 %webapp_register apache %{_webapp}
 
-%triggerun -- apache1 < 1.3.37-3, apache1-base
+%triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache >= 2.0.0
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache >= 2.0.0
 %webapp_unregister httpd %{_webapp}
 
 %files
@@ -294,27 +266,23 @@
 %attr(750,root,http) %dir %{_sysconfdir}/sites
 %attr(750,root,http) %dir %{_sysconfdir}/sites/default
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites/default/*
+%attr(750,root,http) %dir %{_sysconfdir}/sites/all
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sites/all/*
 
 %dir %{_appdir}
-%{_appdir}/database
 %{_appdir}/includes
-%exclude %{_appdir}/includes/database.mysql.inc
-%exclude %{_appdir}/includes/database.pgsql.inc
 %{_appdir}/modules
 %{_appdir}/scripts
-%dir %{_appdir}/themes
-%dir %{_appdir}/themes/engines
+%{_appdir}/themes
 %{_appdir}/po
-%{_appdir}/update.php
-# symlinks
+# symlink
 %{_appdir}/files
-%{_appdir}/misc
 
 %dir %{_appdir}/htdocs
-%{_appdir}/htdocs/*.ico
 %{_appdir}/htdocs/index.php
+%{_appdir}/htdocs/install.php
 %{_appdir}/htdocs/misc
-%dir %{_appdir}/htdocs/themes
+%{_appdir}/htdocs/themes
 %{_appdir}/htdocs/modules
 
 %dir %attr(775,root,http) /var/lib/%{name}
@@ -323,24 +291,19 @@
 %files cron
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
-%attr(755,root,root) %{_appdir}/cron.php
+%attr(775,root,root) %{_appdir}/cron.php
 
 %files db-mysql
 %defattr(644,root,root,755)
-%doc database/*.mysql
-%doc README.replication
-%{_appdir}/includes/database.mysql.inc
+#%doc README.replication
 
 %files db-pgsql
 %defattr(644,root,root,755)
-%doc database/*.pgsql
-%{_appdir}/includes/database.pgsql.inc
 
-%files themes
+%files update
 %defattr(644,root,root,755)
-%{_appdir}/themes/[!e]*
-%{_appdir}/themes/engines/*
-%{_appdir}/htdocs/themes/*
+%{_appdir}/htdocs/update.php
+%{_appdir}/database
 
 %files xmlrpc
 %defattr(644,root,root,755)
@@ -352,6 +315,58 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2010/05/04 15:13:55  glen
+- merged 5.7 from DEVEL: cvs up -j HEAD -j DEVEL, except manually re-merged changelog section
+
+Revision 1.42.2.15  2008/02/20 11:48:52  glen
+- todo?
+
+Revision 1.42.2.14  2008-02-17 21:25:46  bszx
+- updated to 5.7, I haven't noticed a need for symlinks from drupal to drupal/htdocs. Maybe they should be added.
+
+Revision 1.42.2.13  2007-03-19 16:27:01  glen
+- update
+
+Revision 1.42.2.12  2007/03/12 09:37:12  glen
+- add -cron patch
+
+Revision 1.42.2.11  2007/02/12 13:20:12  baggins
+- converted to UTF-8
+
+Revision 1.42.2.10  2007/01/30 07:20:47  glen
+- 5.1, resolves DRUPAL-SA-2007-005
+
+Revision 1.42.2.9  2007/01/29 10:40:42  glen
+- new php virtual deps
+
+Revision 1.42.2.8  2007/01/26 14:09:37  glen
+- update to 5.0
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-cron.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-sitesdir.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-themedir2.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-topdir.patch?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.conf?r1=1.15&r2=1.16&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.cron?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal.spec?r1=1.78&r2=1.79&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/drupal/drupal-apache1.conf?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list