rpms/shapelib/devel shapelib-1.3.0b1-Makefile2.patch, 1.1, 1.2 shapelib.spec, 1.17, 1.18

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	shapelib-1.3.0b1-Makefile2.patch shapelib.spec 
Log Message:
no not depend on gdal; fix patch2

shapelib-1.3.0b1-Makefile2.patch:
 Makefile |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Index: shapelib-1.3.0b1-Makefile2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib-1.3.0b1-Makefile2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- shapelib-1.3.0b1-Makefile2.patch	7 Jan 2010 08:40:20 -0000	1.1
+++ shapelib-1.3.0b1-Makefile2.patch	7 Jan 2010 18:29:56 -0000	1.2
@@ -14,7 +14,7 @@ diff -Naur shapelib-1.3.0b1/contrib/Make
  CFLAGS	=	-g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
  
 -SHPOBJ	=	../shpopen.o ../dbfopen.o 
-+SHPOBJ	=	../shpopen.o ../dbfopen.o  -lgdal
++SHPOBJ	=	../shpopen.o ../dbfopen.o  ../safileio.o
  
  SHPGOBJ =	../shpopen.o ../dbfopen.o shpgeo.o
  


Index: shapelib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/shapelib/devel/shapelib.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- shapelib.spec	7 Jan 2010 08:40:20 -0000	1.17
+++ shapelib.spec	7 Jan 2010 18:29:56 -0000	1.18
@@ -2,7 +2,7 @@
 Summary: API in "C" for Shapefile handling
 Name: shapelib
 Version: 1.3.0b1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # No version of the LGPL is given.
 License: LGPLv2+ or MIT
 URL: http://shapelib.maptools.org/
@@ -14,7 +14,6 @@ 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
-BuildRequires: gdal-devel
 
 %package devel
 Summary: Development files for shapelib
@@ -79,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/libshp.la
 
 %changelog
+* Thu Jan 07 2010 Lucian Langa <cooly at gnome.eu.org> - 1.3.0b1-2
+- fix patch2 - no not depend on gdal
+
 * Thu Jan 07 2010 Lucian Langa <cooly at gnome.eu.org> - 1.3.0b1-1
 - misc cleanups
 - update BR