From 05e589be5a659ca05515ed7d0b54a7786041f72f Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Thu, 7 Jan 2010 18:29:56 +0000 Subject: [PATCH] no not depend on gdal; fix patch2 --- shapelib-1.3.0b1-Makefile2.patch | 2 +- shapelib.spec | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/shapelib-1.3.0b1-Makefile2.patch b/shapelib-1.3.0b1-Makefile2.patch index 8214fd8..70db976 100644 --- a/shapelib-1.3.0b1-Makefile2.patch +++ b/shapelib-1.3.0b1-Makefile2.patch @@ -14,7 +14,7 @@ diff -Naur shapelib-1.3.0b1/contrib/Makefile shapelib-1.3.0b1-mod/contrib/Makefi 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 diff --git a/shapelib.spec b/shapelib.spec index 0c435e6..4618b4f 100644 --- a/shapelib.spec +++ b/shapelib.spec @@ -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 - 1.3.0b1-2 +- fix patch2 - no not depend on gdal + * Thu Jan 07 2010 Lucian Langa - 1.3.0b1-1 - misc cleanups - update BR