From 13f823514d97daaaf8323d066770ded212fe2582 Mon Sep 17 00:00:00 2001
From: Lucian Langa <lucilanga@fedoraproject.org>
Date: Wed, 19 May 2010 20:53:42 +0000
Subject: [PATCH] update patch

---
 shapelib-1.3.0b1-Makefile2.patch | 33 --------------------------------
 shapelib-1.3.0b2-Makefile2.patch | 20 +++++++++++++++++++
 2 files changed, 20 insertions(+), 33 deletions(-)
 delete mode 100644 shapelib-1.3.0b1-Makefile2.patch
 create mode 100644 shapelib-1.3.0b2-Makefile2.patch

diff --git a/shapelib-1.3.0b1-Makefile2.patch b/shapelib-1.3.0b1-Makefile2.patch
deleted file mode 100644
index 9d52fce..0000000
--- a/shapelib-1.3.0b1-Makefile2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- shapelib-1.3.0b1/contrib/Makefile	2004-06-24 03:55:52.000000000 +0300
-+++ shapelib-1.3.0b1.mod/contrib/Makefile	2010-03-09 10:09:54.000000000 +0200
-@@ -3,11 +3,11 @@
- #CFLAGS	=	-g
- 
- # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
- 
- CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
- 
--SHPOBJ	=	../shpopen.o ../dbfopen.o 
-+SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o
- 
- SHPGOBJ =	../shpopen.o ../dbfopen.o shpgeo.o
- 
-@@ -32,7 +32,7 @@
- shpdata:	shpdata.c $(SHPGOBJ)
- 	$(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata
- 
--shpinfo:	shpinfo.c $(SHPOBJ)
-+shpinfo:       shpinfo.c $(SHPGOBJ)
- 	$(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo
- 
- shpfix:		shpfix.c $(SHPOBJ)
-@@ -64,3 +64,7 @@
- 
- testproj: 
- 	tests/shpproj.sh
-+
-+install: all
-+	install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \
-+	$(bindir)
diff --git a/shapelib-1.3.0b2-Makefile2.patch b/shapelib-1.3.0b2-Makefile2.patch
new file mode 100644
index 0000000..52d2f57
--- /dev/null
+++ b/shapelib-1.3.0b2-Makefile2.patch
@@ -0,0 +1,20 @@
+diff -Naur shapelib-1.3.0b2/contrib/Makefile shapelib-1.3.0b2.mod/contrib/Makefile
+--- shapelib-1.3.0b2/contrib/Makefile	2010-01-04 06:08:02.000000000 +0200
++++ shapelib-1.3.0b2.mod/contrib/Makefile	2010-05-19 23:42:22.000000000 +0300
+@@ -32,7 +32,7 @@
+ shpdata:	shpdata.c $(SHPGOBJ)
+ 	$(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata
+ 
+-shpinfo:	shpinfo.c $(SHPOBJ)
++shpinfo:	shpinfo.c $(SHPGOBJ)
+ 	$(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo
+ 
+ shpfix:		shpfix.c $(SHPOBJ)
+@@ -64,3 +64,7 @@
+ 
+ testproj: 
+ 	tests/shpproj.sh
++
++install: all
++	install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \
++	$(bindir)