# HG changeset patch
# User Michael Schloh von Bennewitz <michael@schloh.com>
# Date 1351351143 -7200
# Node ID 7548d72a64e37cc0eb59486b51e03037ae2b2e23
# Parent  0b57a67721e728d545028d3431c17f8123187e97
Update version adjusting patch logic accordingly, correctly create
installation hierarchy, and introduce apache-php::with_xmlwriter
dependency required by rather important XML sitemap logic.

diff -r 0b57a67721e7 -r 7548d72a64e3 drupal/drupal.patch
--- a/drupal/drupal.patch	Sat Oct 27 17:14:38 2012 +0200
+++ b/drupal/drupal.patch	Sat Oct 27 17:19:03 2012 +0200
@@ -77,9 +77,9 @@
    // database then set the user-agent header to the database prefix so that any
    // calls to other Drupal pages will run the SimpleTest prefixed database. The
 Index: modules/system/system.admin.inc
---- modules/system/system.admin.inc.orig	2008-03-25 12:58:16 +0100
-+++ modules/system/system.admin.inc	2008-04-24 11:43:07 +0200
-@@ -1766,6 +1766,165 @@
+--- modules/system/system.admin.inc.orig	2012-10-17 22:45:04.000000000 +0200
++++ modules/system/system.admin.inc	2012-10-27 13:56:02.343450754 +0200
+@@ -1766,6 +1766,65 @@
  }
  
  /**
@@ -166,7 +166,7 @@
 Index: includes/install.core.inc
 --- includes/install.core.inc.orig	2012-08-01 18:27:42.000000000 +0200
 +++ includes/install.core.inc	2012-08-22 21:55:27.582420660 +0200
-@@ -1771,7 +1771,7 @@
+@@ -1770,7 +1770,7 @@
        1 => st('Check for updates automatically'),
        2 => st('Receive e-mail notifications'),
      ),
diff -r 0b57a67721e7 -r 7548d72a64e3 drupal/drupal.spec
--- a/drupal/drupal.spec	Sat Oct 27 17:14:38 2012 +0200
+++ b/drupal/drupal.spec	Sat Oct 27 17:19:03 2012 +0200
@@ -31,7 +31,7 @@
 Class:        PLUS
 Group:        CMS
 License:      GPL
-Version:      7.15
+Version:      7.16
 Release:      20120800
 
 #   package options
@@ -68,6 +68,7 @@
 PreReq:       apache-php::with_session = yes
 PreReq:       apache-php::with_mm = yes
 PreReq:       apache-php::with_xml = yes
+PreReq:       apache-php::with_xmlwriter = yes
 PreReq:       apache-php::with_xslt = yes
 PreReq:       apache-php::with_sendmail = yes
 %if "%{with_mysql}" == "yes"
@@ -109,6 +110,7 @@
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/drupal \
         $RPM_BUILD_ROOT%{l_prefix}/share/drupal \
         $RPM_BUILD_ROOT%{l_prefix}/var/drupal/files \
         $RPM_BUILD_ROOT%{l_prefix}/var/drupal/run \