packages: gpsbabel/gpsbabel.spec, gpsbabel/use-system-shapelib.patch (NEW) ...

[glen]

Author: glen                         Date: Fri Sep  2 04:38:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system shapelib; fedora patch

---- Files affected:
packages/gpsbabel:
   gpsbabel.spec (1.10 -> 1.11) , use-system-shapelib.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gpsbabel/gpsbabel.spec
diff -u packages/gpsbabel/gpsbabel.spec:1.10 packages/gpsbabel/gpsbabel.spec:1.11
--- packages/gpsbabel/gpsbabel.spec:1.10	Thu Sep  1 23:06:23 2011
+++ packages/gpsbabel/gpsbabel.spec	Fri Sep  2 06:38:45 2011
@@ -19,12 +19,14 @@
 Source1:	%{name}.desktop
 Source2:	%{name}.png
 Patch0:		%{name}-auto.patch
+Patch1:       use-system-shapelib.patch
 URL:		http://www.gpsbabel.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
 BuildRequires:	libusb-devel
 BuildRequires:	rpmbuild(macros) >= 1.600
+BuildRequires: shapelib-devel
 %if %{with qt4}
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
@@ -59,6 +61,10 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+# Use system shapelib instead of bundled partial shapelib
+%{__rm} -rf shapelib
 
 %build
 %{__aclocal}
@@ -143,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/09/02 04:38:45  glen
+- use system shapelib; fedora patch
+
 Revision 1.10  2011/09/01 21:06:23  glen
 - add qt4 gui
 

================================================================
Index: packages/gpsbabel/use-system-shapelib.patch
diff -u /dev/null packages/gpsbabel/use-system-shapelib.patch:1.1
--- /dev/null	Fri Sep  2 06:38:51 2011
+++ packages/gpsbabel/use-system-shapelib.patch	Fri Sep  2 06:38:45 2011
@@ -0,0 +1,53 @@
+Use system shapelib - not suitable for upstream in this form.
+
+--- gpsbabel-1.4.2/configure.in	2010-10-10 21:04:52.000000000 +0200
++++ gpsbabel-1.4.2-shapelib/configure.in	2011-01-11 17:22:01.785437703 +0100
+@@ -421,6 +421,6 @@
+ else
+        AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
+ AC_OUTPUT
+ 
+--- gpsbabel-1.4.2/Makefile.in	2011-01-11 17:27:22.684760413 +0100
++++ gpsbabel-1.4.2-shapelib/Makefile.in	2011-01-11 17:24:31.275511027 +0100
+@@ -87,7 +87,7 @@
+ 
+ @PALM_DB_CMT at PALM_DB=pdbfile.o
+ 
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o
++SHAPE=-lshp
+ 
+ ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
+ 	zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
+@@ -818,8 +818,7 @@
+ session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+-  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
+-  shapelib/shapefil.h
++  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
+ skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+   zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h
+ skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
+@@ -1092,8 +1091,6 @@
+   jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
+   jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
+   jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h
+ zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h
+ zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h
+ zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
+--- gpsbabel-1.4.2/shape.c	2010-05-31 23:15:10.000000000 +0200
++++ gpsbabel-1.4.2-shapelib/shape.c	2011-01-11 17:26:19.521297747 +0100
+@@ -20,7 +20,7 @@
+ 
+  */
+ #include "defs.h"
+-#include "shapelib/shapefil.h"
++#include <libshp/shapefil.h>
+ 
+ #if SHAPELIB_ENABLED
+ static SHPHandle ihandle;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gpsbabel/gpsbabel.spec?r1=1.10&r2=1.11&f=u