rpms/shapelib/devel shapelib-1.3.0b1-Makefile.patch, 1.4, 1.5 shapelib-1.3.0b1-Makefile2.patch, 1.3, 1.4 shapelib-1.3.0b1-buildid.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 shapelib.spec, 1.23, 1.24 sources, 1.6, 1.7 shapelib-1.2.10-buildid.patch, 1.2, NONE

Tue Mar 9 15:07:53 UTC 2010

Author: lucilanga

Update of /cvs/pkgs/rpms/shapelib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27905

Modified Files:
	.cvsignore shapelib.spec sources 
Added Files:
	shapelib-1.3.0b1-Makefile.patch 
	shapelib-1.3.0b1-Makefile2.patch 
	shapelib-1.3.0b1-buildid.patch 
Removed Files:
	shapelib-1.2.10-buildid.patch 
Log Message:
update to latest upstream version

shapelib-1.3.0b1-Makefile.patch:
 Makefile |   66 ++++++++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 24 deletions(-)

Index: shapelib-1.3.0b1-Makefile.patch
===================================================================
RCS file: shapelib-1.3.0b1-Makefile.patch
diff -N shapelib-1.3.0b1-Makefile.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shapelib-1.3.0b1-Makefile.patch	9 Mar 2010 15:07:52 -0000	1.5
@@ -0,0 +1,98 @@
+diff -Naur shapelib-1.2.10/Makefile shapelib-1.2.10-mod/Makefile
+--- shapelib-1.2.10/Makefile	2007-12-13 22:27:13.000000000 +0200
++++ shapelib-1.2.10-mod/Makefile	2010-02-19 09:59:18.000000000 +0200
+@@ -6,6 +6,13 @@
+ 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
+ 
+@@ -103,29 +110,34 @@
+ # 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.3.1
+ 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=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. -I. $(CFLAGS) $(LINKOPTS) -c safileio.c
++	rm -f .libs/safileio.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c  -fPIC -DPIC safileio.c -o .libs/safileio.lo
++	$(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c safileio.c -o safileio.o >/dev/null 2>&1
++	mv -f .libs/safileio.lo safileio.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 safileio.lo
+ 	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
+ 	rm -fr .libs/libshp.lax
+ 	mkdir .libs/libshp.lax
+-	$(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo  -lc
++	$(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo safileio.lo -lc
+ 
+ 	(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
+ 	(cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)
+@@ -136,15 +148,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.3.0b1-Makefile2.patch:
 Makefile |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Index: shapelib-1.3.0b1-Makefile2.patch
===================================================================
RCS file: shapelib-1.3.0b1-Makefile2.patch
diff -N shapelib-1.3.0b1-Makefile2.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shapelib-1.3.0b1-Makefile2.patch	9 Mar 2010 15:07:53 -0000	1.4
@@ -0,0 +1,33 @@
+--- 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)

shapelib-1.3.0b1-buildid.patch:
 Makefile |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: shapelib-1.3.0b1-buildid.patch
===================================================================
RCS file: shapelib-1.3.0b1-buildid.patch
diff -N shapelib-1.3.0b1-buildid.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ shapelib-1.3.0b1-buildid.patch	9 Mar 2010 15:07:53 -0000	1.3
@@ -0,0 +1,19 @@
+--- shapelib-1.3.0b1/Makefile	2010-03-09 08:41:01.000000000 +0200
++++ shapelib-1.3.0b1.mod/Makefile	2010-03-09 08:41:29.000000000 +0200
+@@ -12,6 +12,7 @@
+ 
+ CC = gcc
+ CFLAGS =       -g
++LDFLAGS = --build-id
+ 
+ 
+ default:	all
+@@ -137,7 +138,7 @@
+ 	rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.*
+ 	rm -fr .libs/libshp.lax
+ 	mkdir .libs/libshp.lax
+-	$(LD) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo safileio.lo -lc
++	$(LD) $(LDFLAGS) -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION)  shpopen.lo shptree.lo dbfopen.lo safileio.lo -lc
+ 
+ 	(cd .libs && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1)
+ 	(cd .libs && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	16 Feb 2010 09:36:48 -0000	1.5
+++ .cvsignore	9 Mar 2010 15:07:52 -0000	1.6
@@ -1 +1 @@
-shapelib-1.2.10-20100216.tar.gz
+shapelib-1.3.0b1.tar.gz


Index: shapelib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- shapelib.spec	19 Feb 2010 08:28:30 -0000	1.23
+++ shapelib.spec	9 Mar 2010 15:07:53 -0000	1.24
@@ -1,19 +1,16 @@
-%define cvsdate 20100216
-%define snapshot %{cvsdate}cvs
-%define tarfile shapelib-%{version}-%{cvsdate}.tar.gz
 # This RPM will possibly fail on PowerPCs, but I am ignoring this.
 Summary: API in "C" for Shapefile handling
 Name: shapelib
-Version: 1.2.10
-Release: 2.%{snapshot}%{?dist}
+Version: 1.3.0b1
+Release: 5%{?dist}
 # No version of the LGPL is given.
 License: LGPLv2+ or MIT
 URL: http://shapelib.maptools.org/
-Source: http://download.osgeo.org/shapelib/%{tarfile}
-Patch0: shapelib-1.2.10-Makefile.patch
-Patch1: shapelib-1.2.10-endian.patch
-Patch2: shapelib-1.2.10-Makefile2.patch
-Patch3: shapelib-1.2.10-buildid.patch
+Source: http://download.osgeo.org/shapelib/%{name}-%{version}.tar.gz
+Patch0: shapelib-1.3.0b1-Makefile.patch
+Patch1: shapelib-1.3.0b1-Makefile2.patch
+Patch2: shapelib-1.2.10-endian.patch
+Patch3: shapelib-1.3.0b1-buildid.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group: Development/Libraries
 BuildRequires: proj-devel >= 4.4.1
@@ -35,8 +32,8 @@ This package contains libshp and the app
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .endian
-%patch2 -p1 -b .makefile2
+%patch1 -p1 -b .makefile2
+%patch2 -p1 -b .endian
 %patch3 -p1 -b .buildid
 sed -i "s/\r//g" README
 chmod -x README
@@ -81,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Mar 09 2010 Lucian Langa <cooly at gnome.eu.org> - 1.3.0b1-5
+- update to latest upstream version
+
 * Fri Feb 19 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-2.20100216cvs
 - update patch0-3 fix undefined symbols
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Feb 2010 09:36:49 -0000	1.6
+++ sources	9 Mar 2010 15:07:53 -0000	1.7
@@ -1 +1 @@
-f7c299ea1cacdb6e5f481e33fdbe86ba  shapelib-1.2.10-20100216.tar.gz
+b8da228374611880ab52179b70c72f16  shapelib-1.3.0b1.tar.gz


--- shapelib-1.2.10-buildid.patch DELETED ---

