rpms/shapelib/FC-2 shapelib-1.2.10.patch, 1.2, 1.3 shapelib.spec, 1.2, 1.3 shapelib-1.2.10-endian.patch, 1.1, NONE

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/shapelib/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7679/FC-2

Modified Files:
	shapelib-1.2.10.patch shapelib.spec 
Removed Files:
	shapelib-1.2.10-endian.patch 
Log Message:
auto-import shapelib-1.2.10-0.fdr.5.2 on branch FC-2 from shapelib-1.2.10-0.fdr.5.2.src.rpm
Bring in stuff from fedora.us FC2/stable

shapelib-1.2.10.patch:

Index: shapelib-1.2.10.patch
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib-1.2.10.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib-1.2.10.patch	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib-1.2.10.patch	3 Mar 2005 16:48:40 -0000	1.3
@@ -91,8 +91,7 @@
  
  # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
 +CC = gcc
--ENDIAN	=	-D_LITTLE_ENDIAN
-+#ENDIAN	=	-D_LITTLE_ENDIAN
+ ENDIAN	=	-D_LITTLE_ENDIAN
  
 -CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
 +EXTRACFLAGS   =      -g


Index: shapelib.spec
===================================================================
RCS file: /cvs/extras/rpms/shapelib/FC-2/shapelib.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shapelib.spec	13 Feb 2005 12:11:03 -0000	1.2
+++ shapelib.spec	3 Mar 2005 16:48:40 -0000	1.3
@@ -2,12 +2,11 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 6
+Release: 0.fdr.5.2
 Epoch: 0
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
 Patch0: shapelib-%{version}.patch
-Patch1: shapelib-1.2.10-endian.patch
 License: LGPL/MIT
 Group: Development/Libraries
 Buildrequires: libtool
@@ -31,7 +30,6 @@
 %prep
 %setup -q -T -b 0
 %patch -p1 -b .buildroot 
-%patch1 -p1 -b .endian
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -72,10 +70,7 @@
 %exclude %{_libdir}/libshp.la
 
 %changelog
-* Sun Feb 13 2005 David Woodhouse <dwmw2 at infradead.org> 0:1.2.10-6
-- Don't hard-code endianness; just use endian.h
-
-* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-5
+* Wed Dec 15 2004 David M. Kaplan <dmk at erizo.ucdavis.edu> 0:1.2.10-0.fdr.5
 - Patched patch and spec file according to suggestions of Michael Schwendt
 - In particular, this separates the building from the installing in the rpm.
 


--- shapelib-1.2.10-endian.patch DELETED ---