From 01b90833123f61d5a37ac74476fb602f8432d240 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Thu, 21 Apr 2011 18:22:22 +0200
Subject: [PATCH] remove endian definition from Makefile, leave it to endian.h
 fixes p.e. https://ppc.koji.fedoraproject.org/koji/taskinfo?taskID=197517

---
 shapelib-1.2.10-Makefile2.patch  |  9 ---------
 shapelib-1.3.0b2-Makefile2.patch | 22 +++++++++++++++++-----
 shapelib.spec                    |  7 +++++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/shapelib-1.2.10-Makefile2.patch b/shapelib-1.2.10-Makefile2.patch
index 5045c97..bcf98cc 100644
--- a/shapelib-1.2.10-Makefile2.patch
+++ b/shapelib-1.2.10-Makefile2.patch
@@ -1,15 +1,6 @@
 diff -Naur shapelib-1.2.10/contrib/Makefile shapelib-1.2.10-mod/contrib/Makefile
 --- shapelib-1.2.10/contrib/Makefile	2010-01-04 06:08:02.000000000 +0200
 +++ shapelib-1.2.10-mod/contrib/Makefile	2010-02-16 10:18:48.000000000 +0200
-@@ -3,7 +3,7 @@
- #CFLAGS	=	-g
- 
- # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
- 
- CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
- 
 @@ -32,7 +32,7 @@
  shpdata:	shpdata.c $(SHPGOBJ)
  	$(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata
diff --git a/shapelib-1.3.0b2-Makefile2.patch b/shapelib-1.3.0b2-Makefile2.patch
index 52d2f57..297c5b2 100644
--- a/shapelib-1.3.0b2-Makefile2.patch
+++ b/shapelib-1.3.0b2-Makefile2.patch
@@ -1,7 +1,19 @@
-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 @@
+diff -up shapelib-1.3.0b2/contrib/Makefile.makefile2 shapelib-1.3.0b2/contrib/Makefile
+--- shapelib-1.3.0b2/contrib/Makefile.makefile2	2010-01-04 05:08:02.000000000 +0100
++++ shapelib-1.3.0b2/contrib/Makefile	2011-04-21 18:10:35.000000000 +0200
+@@ -2,10 +2,7 @@
+ #LINKOPT	=	/usr/local/lib/libdbmalloc.a
+ #CFLAGS	=	-g
+ 
+-# Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
+-ENDIAN	=	-D_LITTLE_ENDIAN
+-
+-CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
++CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 -DDEBUG -DDEBUG2 
+ 
+ SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o
+ 
+@@ -32,7 +29,7 @@ shpcentrd:	shpcentrd.c $(SHPGOBJ)
  shpdata:	shpdata.c $(SHPGOBJ)
  	$(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata
  
@@ -10,7 +22,7 @@ diff -Naur shapelib-1.3.0b2/contrib/Makefile shapelib-1.3.0b2.mod/contrib/Makefi
  	$(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo
  
  shpfix:		shpfix.c $(SHPOBJ)
-@@ -64,3 +64,7 @@
+@@ -64,3 +61,7 @@ check:	testproj
  
  testproj: 
  	tests/shpproj.sh
diff --git a/shapelib.spec b/shapelib.spec
index 8c76d5c..f4a8779 100644
--- a/shapelib.spec
+++ b/shapelib.spec
@@ -2,7 +2,7 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.3.0b2
-Release: 7%{?dist}
+Release: 7.1%{?dist}
 # No version of the LGPL is given.
 License: LGPLv2+ or MIT
 URL: http://shapelib.maptools.org/
@@ -33,7 +33,7 @@ This package contains libshp and the appropriate header files.
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .makefile
 %patch1 -p1 -b .makefile2
-%patch2 -p1 -b .endian
+#patch2 -p1 -b .endian
 %patch3 -p1 -b .buildid
 sed -i "s/\r//g" README
 chmod -x README
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 21 2011 Karsten Hopp <karsten@redhat.com> 1.3.0b2-7.1
+- remove endian definition from Makefile, leave it to endian.h
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0b2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild