From 4ba5dc79e763d9c0c345524389572af8223a9080ea349a72f91a0bf93265bddc Mon Sep 17 00:00:00 2001
From: Bjoern Schilberg <bjoern@intevation.de>
Date: Fri, 27 May 2011 13:53:37 +0000
Subject: [PATCH] More patch adventures...

OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=75
---
 mapserver.spec          |  2 +-
 patch_3877-r11714.patch | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/mapserver.spec b/mapserver.spec
index 9536037..60a2740 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -115,7 +115,7 @@ within the Java programming language.
 %prep
 %setup -q -n %{name}-%{fileversion}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 #%patch2 -p1
 
 # fix spurious perm bits
diff --git a/patch_3877-r11714.patch b/patch_3877-r11714.patch
index c6b6320..cc8f55b 100644
--- a/patch_3877-r11714.patch
+++ b/patch_3877-r11714.patch
@@ -1,16 +1,4 @@
-Index: mapserver-6.0.0/HISTORY.TXT
-===================================================================
---- mapserver-6.0.0/HISTORY.TXT	(revision 11709)
-+++ mapserver-6.0.0/HISTORY.TXT	(revision 11714)
-@@ -15,4 +15,6 @@
- Version 6.0.1 (SVN branch-6-0):
- ---------------------------
-+
-+- Fixed the build problem in mapunion.c (#3877)
- 
- - Union layer: Fixed the crash when styling source layers using attributes (#3870)
-Index: mapserver-6.0.0/mapunion.c
-===================================================================
+diff -urNad mapserver-6.0.0~/mapunion.c mapserver-6.0.0/mapunion.c
 --- mapserver-6.0.0/mapunion.c	(revision 11709)
 +++ mapserver-6.0.0/mapunion.c	(revision 11714)
 @@ -316,5 +316,5 @@