[drupal7] Patch fix.

[Jon Ciesla]

commit 72114ec00c5d209b22645d64a408ac9dbd603e3d
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu May 26 08:08:43 2011 -0500

    Patch fix.

 drupal7-7.0-scripts-noshebang.patch |   65 +++++++++++++++--------------------
 drupal7.spec                        |    2 +-
 2 files changed, 29 insertions(+), 38 deletions(-)
---
diff --git a/drupal7-7.0-scripts-noshebang.patch b/drupal7-7.0-scripts-noshebang.patch
index 3276e3c..9c61dd8 100644
--- a/drupal7-7.0-scripts-noshebang.patch
+++ b/drupal7-7.0-scripts-noshebang.patch
@@ -1,63 +1,54 @@
-diff -U3 -r scripts.orig/code-clean.sh scripts/code-clean.sh
---- scripts.orig/code-clean.sh	2009-03-09 15:46:37.000000000 -0500
-+++ scripts/code-clean.sh	2011-02-21 20:39:32.000000000 -0600
+diff -r -U3 drupal-7.2.orig/scripts/code-clean.sh drupal-7.2/scripts/code-clean.sh
+--- drupal-7.2.orig/scripts/code-clean.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/code-clean.sh	2011-05-26 08:04:18.723466000 -0500
 @@ -1,4 +1,3 @@
 -#!/bin/sh
- # $Id: code-clean.sh,v 1.10 2009/03/09 20:46:37 dries Exp $
  
  find . -name "*~" -type f | xargs rm -f
-Only in scripts/: code-clean.sh~
-diff -U3 -r scripts.orig/cron-curl.sh scripts/cron-curl.sh
---- scripts.orig/cron-curl.sh	2006-08-22 02:38:24.000000000 -0500
-+++ scripts/cron-curl.sh	2011-02-21 20:39:36.000000000 -0600
-@@ -1,4 +1,3 @@
+ find . -name ".#*" -type f | xargs rm -f
+diff -r -U3 drupal-7.2.orig/scripts/cron-curl.sh drupal-7.2/scripts/cron-curl.sh
+--- drupal-7.2.orig/scripts/cron-curl.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/cron-curl.sh	2011-05-26 08:04:43.613465989 -0500
+@@ -1,3 +1,2 @@
 -#!/bin/sh
- # $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  curl --silent --compressed http://example.com/cron.php
-Only in scripts/: cron-curl.sh~
-diff -U3 -r scripts.orig/cron-lynx.sh scripts/cron-lynx.sh
---- scripts.orig/cron-lynx.sh	2006-08-22 02:38:24.000000000 -0500
-+++ scripts/cron-lynx.sh	2011-02-21 20:39:41.000000000 -0600
-@@ -1,4 +1,3 @@
+diff -r -U3 drupal-7.2.orig/scripts/cron-lynx.sh drupal-7.2/scripts/cron-lynx.sh
+--- drupal-7.2.orig/scripts/cron-lynx.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/cron-lynx.sh	2011-05-26 08:04:54.503466000 -0500
+@@ -1,3 +1,2 @@
 -#!/bin/sh
- # $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1
-Only in scripts/: cron-lynx.sh~
-diff -U3 -r scripts.orig/drupal.sh scripts/drupal.sh
---- scripts.orig/drupal.sh	2009-09-19 05:38:47.000000000 -0500
-+++ scripts/drupal.sh	2011-02-21 20:39:45.000000000 -0600
+diff -r -U3 drupal-7.2.orig/scripts/drupal.sh drupal-7.2/scripts/drupal.sh
+--- drupal-7.2.orig/scripts/drupal.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/drupal.sh	2011-05-26 08:05:19.792466001 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env php
  <?php
- // $Id: drupal.sh,v 1.9 2009/09/19 10:38:47 dries Exp $
  
-Only in scripts/: drupal.sh~
-diff -U3 -r scripts.orig/dump-database-d6.sh scripts/dump-database-d6.sh
---- scripts.orig/dump-database-d6.sh	2010-07-29 20:28:00.000000000 -0500
-+++ scripts/dump-database-d6.sh	2011-02-21 20:39:50.000000000 -0600
+ /**
+diff -r -U3 drupal-7.2.orig/scripts/dump-database-d6.sh drupal-7.2/scripts/dump-database-d6.sh
+--- drupal-7.2.orig/scripts/dump-database-d6.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/dump-database-d6.sh	2011-05-26 08:05:31.567466002 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env php
  <?php
- // $Id: dump-database-d6.sh,v 1.3 2010/07/30 01:28:00 dries Exp $
  
-Only in scripts/: dump-database-d6.sh~
-diff -U3 -r scripts.orig/generate-d6-content.sh scripts/generate-d6-content.sh
---- scripts.orig/generate-d6-content.sh	2010-09-10 19:39:49.000000000 -0500
-+++ scripts/generate-d6-content.sh	2011-02-21 20:39:54.000000000 -0600
+ /**
+diff -r -U3 drupal-7.2.orig/scripts/generate-d6-content.sh drupal-7.2/scripts/generate-d6-content.sh
+--- drupal-7.2.orig/scripts/generate-d6-content.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/generate-d6-content.sh	2011-05-26 08:05:52.894465989 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/env php
  <?php
- // $Id: generate-d6-content.sh,v 1.3 2010/09/11 00:39:49 webchick Exp $
  
-Only in scripts/: generate-d6-content.sh~
-diff -U3 -r scripts.orig/password-hash.sh scripts/password-hash.sh
---- scripts.orig/password-hash.sh	2010-05-01 03:12:23.000000000 -0500
-+++ scripts/password-hash.sh	2011-02-21 20:40:06.000000000 -0600
+ /**
+diff -r -U3 drupal-7.2.orig/scripts/password-hash.sh drupal-7.2/scripts/password-hash.sh
+--- drupal-7.2.orig/scripts/password-hash.sh	2011-05-25 15:41:42.000000000 -0500
++++ drupal-7.2/scripts/password-hash.sh	2011-05-26 08:06:00.870466005 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/php
  <?php
- // $Id: password-hash.sh,v 1.7 2010/05/01 08:12:23 dries Exp $
  
-Only in scripts/: password-hash.sh~
+ /**
diff --git a/drupal7.spec b/drupal7.spec
index 08bb740..8392c36 100644
--- a/drupal7.spec
+++ b/drupal7.spec
@@ -28,7 +28,7 @@ configurable, skinnable, and secure.
 
 %setup -q -n drupal-%{version}
 
-%patch0 -p0
+%patch0 -p1
 
 chmod -x scripts/drupal.sh
 chmod -x scripts/password-hash.sh