Update version adjusting patch logic accordingly, correctly create

Sat, 27 Oct 2012 17:19:03 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 27 Oct 2012 17:19:03 +0200
changeset 748
7548d72a64e3
parent 747
0b57a67721e7
child 749
cb3670951831

Update version adjusting patch logic accordingly, correctly create
installation hierarchy, and introduce apache-php::with_xmlwriter
dependency required by rather important XML sitemap logic.

drupal/drupal.patch file | annotate | diff | comparison | revisions
drupal/drupal.spec file | annotate | diff | comparison | revisions
     1.1 --- a/drupal/drupal.patch	Sat Oct 27 17:14:38 2012 +0200
     1.2 +++ b/drupal/drupal.patch	Sat Oct 27 17:19:03 2012 +0200
     1.3 @@ -77,9 +77,9 @@
     1.4     // database then set the user-agent header to the database prefix so that any
     1.5     // calls to other Drupal pages will run the SimpleTest prefixed database. The
     1.6  Index: modules/system/system.admin.inc
     1.7 ---- modules/system/system.admin.inc.orig	2008-03-25 12:58:16 +0100
     1.8 -+++ modules/system/system.admin.inc	2008-04-24 11:43:07 +0200
     1.9 -@@ -1766,6 +1766,165 @@
    1.10 +--- modules/system/system.admin.inc.orig	2012-10-17 22:45:04.000000000 +0200
    1.11 ++++ modules/system/system.admin.inc	2012-10-27 13:56:02.343450754 +0200
    1.12 +@@ -1766,6 +1766,65 @@
    1.13   }
    1.14   
    1.15   /**
    1.16 @@ -166,7 +166,7 @@
    1.17  Index: includes/install.core.inc
    1.18  --- includes/install.core.inc.orig	2012-08-01 18:27:42.000000000 +0200
    1.19  +++ includes/install.core.inc	2012-08-22 21:55:27.582420660 +0200
    1.20 -@@ -1771,7 +1771,7 @@
    1.21 +@@ -1770,7 +1770,7 @@
    1.22         1 => st('Check for updates automatically'),
    1.23         2 => st('Receive e-mail notifications'),
    1.24       ),
     2.1 --- a/drupal/drupal.spec	Sat Oct 27 17:14:38 2012 +0200
     2.2 +++ b/drupal/drupal.spec	Sat Oct 27 17:19:03 2012 +0200
     2.3 @@ -31,7 +31,7 @@
     2.4  Class:        PLUS
     2.5  Group:        CMS
     2.6  License:      GPL
     2.7 -Version:      7.15
     2.8 +Version:      7.16
     2.9  Release:      20120800
    2.10  
    2.11  #   package options
    2.12 @@ -68,6 +68,7 @@
    2.13  PreReq:       apache-php::with_session = yes
    2.14  PreReq:       apache-php::with_mm = yes
    2.15  PreReq:       apache-php::with_xml = yes
    2.16 +PreReq:       apache-php::with_xmlwriter = yes
    2.17  PreReq:       apache-php::with_xslt = yes
    2.18  PreReq:       apache-php::with_sendmail = yes
    2.19  %if "%{with_mysql}" == "yes"
    2.20 @@ -109,6 +110,7 @@
    2.21      %{l_shtool} mkdir -f -p -m 755 \
    2.22          $RPM_BUILD_ROOT%{l_prefix}/sbin \
    2.23          $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
    2.24 +        $RPM_BUILD_ROOT%{l_prefix}/etc/drupal \
    2.25          $RPM_BUILD_ROOT%{l_prefix}/share/drupal \
    2.26          $RPM_BUILD_ROOT%{l_prefix}/var/drupal/files \
    2.27          $RPM_BUILD_ROOT%{l_prefix}/var/drupal/run \

mercurial