- updated to 1.5.1

diff --git a/gmapbase.patch b/gmapbase.patch
index a0c9df8b19291d9a1d691d81f364927a35cccdf7..e92ef281f9426ade87fc795652e3cff3d439d243 100644 (file)
--- a/gmapbase.patch
+++ b/gmapbase.patch
@@ -1,5 +1,5 @@
---- gpsbabel-1.4.3/gui/map.cpp~        2009-08-28 20:08:55.000000000 +0300
-+++ gpsbabel-1.4.3/gui/map.cpp 2012-02-12 23:10:09.498423153 +0200
+--- gpsbabel-1.5.1/gui/map.cc.orig     2013-12-31 02:01:14.000000000 +0100
++++ gpsbabel-1.5.1/gui/map.cc  2014-11-23 10:52:00.923720369 +0100
 @@ -60,7 +60,7 @@
    connect(this,SIGNAL(loadFinished(bool)),
          this,SLOT(loadFinishedX(bool)));

diff --git a/gpsbabel-link.patch b/gpsbabel-link.patch
index 329b57273e0f6198efcd4e20cb43e5375ba322aa..cdafea7a099bfdc93b219d56d576da4b513e0cd7 100644 (file)
--- a/gpsbabel-link.patch
+++ b/gpsbabel-link.patch
@@ -1,11 +1,11 @@
---- gpsbabel-1.4.3/Makefile.in.orig    2012-02-19 14:15:39.111366297 +0100
-+++ gpsbabel-1.4.3/Makefile.in 2012-02-19 14:28:38.421392392 +0100
-@@ -98,7 +98,7 @@
-           uuid.o formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
+--- gpsbabel-1.5.1/Makefile.in.orig    2014-11-23 10:53:00.579901305 +0100
++++ gpsbabel-1.5.1/Makefile.in 2014-11-23 10:54:42.482400863 +0100
+@@ -111,7 +111,7 @@
+           formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
          inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
-         gbfile.o parse.o avltree.o session.o \
+         gbfile.o parse.o session.o src/core/xmlstreamwriter.o \
 -      $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
 +      $(PALM_DB) $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS) $(SHAPE) @ZLIB@
  OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
  
- .c.o:
+ DEPFILES = $(OBJS:.o=.d)

diff --git a/gpsbabel.spec b/gpsbabel.spec
index c0ee0ba433acfa8c2071a0bbe2c2da9f949fc576..e9e1e19020cbe25adeff93bb062034fdbfcc2b68 100644 (file)
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -6,7 +6,7 @@
 Summary:       GPSBabel - convert GPS waypoint, route and track data
 Summary(pl.UTF-8):     GPSBabel - konwertowanie danych GPS: waypointów, tras i śladów
 Name:          gpsbabel
-Version:       1.4.4
+Version:       1.5.1
 Release:       1
 License:       GPL v2+
 Group:         Applications/Engineering
@@ -15,7 +15,7 @@ Group:                Applications/Engineering
 # token=$(curl -s http://www.gpsbabel.org/download.html | sed -rne 's/.*gpsbabel-'$version'\.tar\.gz.*token.*value="([^"]+)".*/\1/p' | head -n1)
 # curl -F "token=$token" -F "dl=gpsbabel-$version.tar.gz" http://www.gpsbabel.org/plan9.php -o gpsbabel-$version.tar.gz
 Source0:       %{name}-%{version}.tar.gz
-# Source0-md5: 6c4c8f0cb9fcf9f8302585148878f174
+# Source0-md5: 0016c6313b3a5b97afd8d1d8f23abbe1
 Source1:       %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-auto.patch

diff --git a/use-system-shapelib.patch b/use-system-shapelib.patch
index e465bcbff6f6c6ffd257d12fc2e327ebae9f18c6..1fcf0f035b1fa335f82a1f10638a3cdebf10ddd1 100644 (file)
--- a/use-system-shapelib.patch
+++ b/use-system-shapelib.patch
@@ -1,47 +1,42 @@
 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.5.1/configure.in.orig   2014-11-23 10:08:03.673956695 +0100
++++ gpsbabel-1.5.1/configure.in        2014-11-23 10:36:15.211127830 +0100
+@@ -340,7 +340,7 @@
+ AC_SUBST(QT_SYSINC_OPT)
+ AC_SUBST(QT_LIBS)
  
---- 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 @@
+-AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty])
++AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
+ AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh])
+ AC_OUTPUT
  
- @PALM_DB_CMT@PALM_DB=pdbfile.o
+--- gpsbabel-1.5.1/Makefile.in.orig    2014-11-23 10:08:03.677290002 +0100
++++ gpsbabel-1.5.1/Makefile.in 2014-11-23 10:40:46.535655647 +0100
+@@ -99,7 +99,7 @@
+ # Extra modules in Jeeps that we don't use
+ #     jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
  
--SHAPE=shapelib/shpopen.o shapelib/dbfopen.o
+-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.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 \
+@@ -906,11 +906,7 @@
+ session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+ shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+-  gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.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
+-shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
+-shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
+-shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h
++  gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h 
+ skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+   gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h
+ skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
+--- gpsbabel-1.5.1/shape.cc.orig       2014-04-10 04:43:08.000000000 +0200
++++ gpsbabel-1.5.1/shape.cc    2014-11-23 10:42:23.854932957 +0100
 @@ -20,7 +20,7 @@
  
   */