Updated with current cvs snapshot

shapelib-1.2.10-Makefile.patch

@@ -0,0 +1,92 @@
+--- shapelib-1.2.11-orig/Makefile	2006-01-07 13:06:27.000000000 -0800
++++ shapelib-1.2.11/Makefile	2006-03-04 19:58:22.000000000 -0800
+@@ -1,11 +1,12 @@
+-
+-#LINKOPT	=	/usr/local/lib/libdbmalloc.a 
+-#LINKOPT = 	/usr/local/lib/cpl.a
+-CFLAGS	=	-g
+-#CFLAGS  =       -g -DUSE_CPL
+ INSTALL = /usr/bin/install
+ LD = /usr/bin/ld
+-#CC = g++
++
++bindir = /usr/local/bin
++libdir = /usr/local/lib
++includedir = /usr/local/include
++
++CC = gcc
++CFLAGS	=	-g
+ 
+ default:	all
+ 
+@@ -100,25 +101,25 @@
+ # The following is contributed by Jan-Oliver Wagner, and should allow for
+ # creating shared libraries on most platforms with gcc, and libtool installed.
+ 
+-SHPLIB_VERSION=1.2.9
++SHPLIB_VERSION=1.2.11
+ LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry
+ 
+ lib:
+-	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shpopen.c
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c  -fPIC -DPIC shpopen.c -o .libs/shpopen.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c -o shpopen.o >/dev/null 2>&1
+ 	mv -f .libs/shpopen.lo shpopen.lo
+-	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c shptree.c
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CFLAGS) $(LINKOPTS) -c shptree.c
+ 	rm -f .libs/shptree.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c  -fPIC -DPIC shptree.c -o .libs/shptree.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c -o shptree.o >/dev/null 2>&1
+ 	mv -f .libs/shptree.lo shptree.lo
+-	/bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. -I/usr/local/include    -g -O2 -c dbfopen.c
++	/bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c
+ 	rm -f .libs/dbfopen.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
+-	gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c  -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1
+ 	mv -f .libs/dbfopen.lo dbfopen.lo
+-	/bin/sh ./libtool --mode=link gcc  -g -O2  -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
++	/bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS)  -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo  
+ 	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
+ 	rm -fr .libs/libshp.lax
+ 	mkdir .libs/libshp.lax
+@@ -133,15 +134,21 @@
+ 
+ lib_install:
+ 	cp .libs/libshp.la .libs/libshp.lai
+-	/bin/sh ./mkinstalldirs /usr/local/lib
+-	/bin/sh ./libtool  --mode=install $(INSTALL) -c libshp.la /usr/local/lib/libshp.la
+-	$(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
+-	(cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
+-	(cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
+-	chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION)
+-	$(INSTALL) -c .libs/libshp.la /usr/local/lib/libshp.la
+-	$(INSTALL) -c .libs/libshp.a /usr/local/lib/libshp.a
+-	ranlib /usr/local/lib/libshp.a
+-	chmod 644 /usr/local/lib/libshp.a
+-	/bin/sh ./mkinstalldirs /usr/local/include/libshp
+-	$(INSTALL) -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h
++	/bin/sh ./mkinstalldirs $(libdir)
++	/bin/sh ./libtool  --mode=install $(INSTALL) -c libshp.la $(libdir)/libshp.la
++	$(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) $(libdir)/libshp.so.$(LIBSHP_VERSION)
++	(cd $(libdir) && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
++	(cd $(libdir) && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
++	chmod +x $(libdir)/libshp.so.$(LIBSHP_VERSION)
++	$(INSTALL) -c .libs/libshp.la $(libdir)/libshp.la
++	$(INSTALL) -c .libs/libshp.a $(libdir)/libshp.a
++	ranlib $(libdir)/libshp.a
++	chmod 644 $(libdir)/libshp.a
++	/bin/sh ./mkinstalldirs $(includedir)/libshp
++	$(INSTALL) -c -m 644 shapefil.h $(includedir)/libshp/shapefil.h
++
++bin_install: all
++	mkdir -p $(bindir)
++	install dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shptest $(bindir)/
++
++install: bin_install lib_install

shapelib-1.2.10-Makefile2.patch

@@ -0,0 +1,22 @@
+--- shapelib-1.2.11-orig/contrib/Makefile	2006-01-07 12:34:14.000000000 -0800
++++ shapelib-1.2.11/contrib/Makefile	2006-03-04 20:11:01.000000000 -0800
+@@ -1,9 +1,10 @@
++bindir = /usr/local/bin
+ 
+ #LINKOPT	=	/usr/local/lib/libdbmalloc.a
+ #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 
+ 
+@@ -64,3 +65,7 @@
+ 
+ testproj: 
+ 	tests/shpproj.sh
++
++install: all
++	install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \
++		$(bindir)

shapelib.spec

@@ -2,15 +2,14 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.2.10
-Release: 9
+Release: 10.20060304cvs
 URL: http://shapelib.maptools.org/
 Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz
-Patch0: shapelib-%{version}.patch
+Patch0: shapelib-1.2.10-Makefile.patch
 Patch1: shapelib-1.2.10-endian.patch
-Patch2: shapelib-1.2.10-gcc4.patch
+Patch2: shapelib-1.2.10-Makefile2.patch
 License: LGPL/MIT
 Group: Development/Libraries
-Buildrequires: libtool
 BuildRequires: proj-devel >= 4.4.1
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -32,7 +31,7 @@ This package contains libshp and the appropriate header files.
 %setup -q -T -b 0
 %patch -p1 -b .buildroot
 %patch1 -p1 -b .endian
-%patch2 -p1 -b .gcc4
+%patch2 -p1 -b .buildroot
 
 %build
 make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib
@@ -61,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/*.so.*
 
-%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html
+%doc LICENSE.LGPL README README.tree web/*.html
 %doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh
 %doc stream2.out makeshape.sh stream3.out ChangeLog
 
@@ -73,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Sat Mar  4 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-10.20060304cvs
+- Upgraded to cvs snapshot taken on March 4, 2006
+
 * Sat Mar  4 2006 Shawn McCann <mccann0011@hotmail.com> - 1.2.10-9
 - Rebuild for Fedora Extras 5
 

sources

@@ -1 +1 @@
-4d96bd926167193d27bf14d56e2d484e  shapelib-1.2.10.tar.gz
+1bec42cacea2792790530f6c5ec6664c  shapelib-1.2.10.tar.gz