- use system shapelib; fedora patch

Changed files:
    gpsbabel.spec -> 1.11
    use-system-shapelib.patch -> 1.1

diff --git a/gpsbabel.spec b/gpsbabel.spec
index d72e3ba100049ce3acd09de88376e9387968d046..5a0bc29fe9901ffb27d6af6eddda0c63c63f9119 100644 (file)
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -18,12 +18,14 @@ Source0:    http://pkgs.fedoraproject.org/repo/pkgs/gpsbabel/%{name}-%{version}.tar
 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}
@@ -58,6 +60,10 @@ Qt GUI interface for GPSBabel
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+# Use system shapelib instead of bundled partial shapelib
+%{__rm} -rf shapelib
 
 %build
 %{__aclocal}

diff --git a/use-system-shapelib.patch b/use-system-shapelib.patch
new file mode 100644 (file)
index 0000000..e465bcb
--- /dev/null
+++ b/use-system-shapelib.patch
@@ -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@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;