[gpsbabel] Upstream update.
corsepiu
corsepiu at fedoraproject.org
Tue Sep 18 00:51:15 UTC 2012
commit d74c5214be6cf731c3333eb7015af9aed382f623
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Tue Sep 18 02:50:40 2012 +0200
Upstream update.
- Rebase patches.
- Use upstream gpsbabel.desktop.
- Address RHBZ 668865.
- Fix gzFile pointer abuse.
- Install gmapbase.html to /usr/share/gpsbabel.
.gitignore | 3 +-
gpsbabel-1.3.5-autoconf.patch | 12 -----
gpsbabel-1.4.3-gmapbase.patch | 25 +++++++++
gpsbabel-1.4.3-gzip.diff | 25 +++++++++
gpsbabel-1.4.3-nosolicitation.patch | 14 +++++
...tch => gpsbabel-1.4.3-use-system-shapelib.patch | 34 ++++++------
gpsbabel.desktop | 9 ---
gpsbabel.spec | 53 +++++++++++++++-----
sources | 3 +-
9 files changed, 124 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9efba80..c559248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-gpsbabel-1.3.6.tar.gz
-/gpsbabel-1.4.2.tar.gz
/style3.css
+/gpsbabel-1.4.4.tar.gz
diff --git a/gpsbabel-1.4.3-gmapbase.patch b/gpsbabel-1.4.3-gmapbase.patch
new file mode 100644
index 0000000..12cf096
--- /dev/null
+++ b/gpsbabel-1.4.3-gmapbase.patch
@@ -0,0 +1,25 @@
+diff --git a/gui/map.cpp b/gui/map.cpp
+index 21e4c23..e6e855c 100755
+--- a/gui/map.cpp
++++ b/gui/map.cpp
+@@ -34,6 +34,10 @@
+ #include "appname.h"
+ #include "dpencode.h"
+
++#ifndef PKGDATADIR
++#define PKGDATADIR "/usr/share/gpsbabel"
++#endif
++
+ //------------------------------------------------------------------------
+ static QString stripDoubleQuotes(const QString s) {
+ QString out;
+@@ -60,7 +64,8 @@ Map::Map(QWidget *parent,
+ connect(this,SIGNAL(loadFinished(bool)),
+ this,SLOT(loadFinishedX(bool)));
+ this->logTimeX("Start map constuctor");
+- QString baseFile = QApplication::applicationDirPath() + "/gmapbase.html";
++ QString baseFile = PKGDATADIR;
++ baseFile += "/gmapbase.html";
+ if (!QFile(baseFile).exists()) {
+ QMessageBox::critical(0, appName,
+ tr("Missing \"gmapbase.html\" file. Check installation"));
diff --git a/gpsbabel-1.4.3-gzip.diff b/gpsbabel-1.4.3-gzip.diff
new file mode 100644
index 0000000..712cd97
--- /dev/null
+++ b/gpsbabel-1.4.3-gzip.diff
@@ -0,0 +1,25 @@
+--- gpsbabel-1.4.3.orig/gbfile.c 2011-07-26 03:56:33.000000000 +0200
++++ gpsbabel-1.4.3/gbfile.c 2012-08-24 13:46:51.008504331 +0200
+@@ -84,9 +84,9 @@
+ fd = stdout;
+ }
+ SET_BINARY_MODE(fd);
+- self->handle.gz = (void**)gzdopen(fileno(fd), openmode);
++ self->handle.gz = gzdopen(fileno(fd), openmode);
+ } else {
+- self->handle.gz = (void**)gzopen(self->name, openmode);
++ self->handle.gz = gzopen(self->name, openmode);
+ }
+
+ if (self->handle.gz == NULL) {
+--- gpsbabel-1.4.3.orig/gbfile.h 2011-07-26 03:56:33.000000000 +0200
++++ gpsbabel-1.4.3/gbfile.h 2012-08-24 13:54:18.958996856 +0200
+@@ -52,7 +52,7 @@
+ FILE* std;
+ unsigned char* mem;
+ #if !ZLIB_INHIBITED
+- gzFile* gz;
++ gzFile gz;
+ #endif
+ } handle;
+ char* name;
diff --git a/gpsbabel-1.4.3-nosolicitation.patch b/gpsbabel-1.4.3-nosolicitation.patch
new file mode 100644
index 0000000..02e36c2
--- /dev/null
+++ b/gpsbabel-1.4.3-nosolicitation.patch
@@ -0,0 +1,14 @@
+diff -Naur gpsbabel-1.4.3.orig/gui/babeldata.h gpsbabel-1.4.3/gui/babeldata.h
+--- gpsbabel-1.4.3.orig/gui/babeldata.h 2010-06-20 01:59:06.000000000 +0200
++++ gpsbabel-1.4.3/gui/babeldata.h 2012-08-24 09:07:28.719568882 +0200
+@@ -63,8 +63,8 @@
+ upgradeErrors(0),
+ upgradeOffers(0),
+ runCount(0),
+- startupVersionCheck(true),
+- reportStatistics(true),
++ startupVersionCheck(false),
++ reportStatistics(false),
+ allowBetaUpgrades(false),
+ ignoreVersionMismatch(false),
+ disableDonateDialog(false),
diff --git a/gpsbabel-1.4.2-use-system-shapelib.patch b/gpsbabel-1.4.3-use-system-shapelib.patch
similarity index 75%
rename from gpsbabel-1.4.2-use-system-shapelib.patch
rename to gpsbabel-1.4.3-use-system-shapelib.patch
index 58f2b05..fd4ca8d 100644
--- a/gpsbabel-1.4.2-use-system-shapelib.patch
+++ b/gpsbabel-1.4.3-use-system-shapelib.patch
@@ -1,7 +1,7 @@
-diff -ru gpsbabel-1.4.2/configure gpsbabel-1.4.2-shapelib/configure
---- gpsbabel-1.4.2/configure 2010-10-10 21:04:52.000000000 +0200
-+++ gpsbabel-1.4.2-shapelib/configure 2011-01-11 17:25:17.771847993 +0100
-@@ -4940,7 +4940,7 @@
+diff -Naur gpsbabel-1.4.3.orig/configure gpsbabel-1.4.3/configure
+--- gpsbabel-1.4.3.orig/configure 2012-01-30 04:37:29.000000000 +0100
++++ gpsbabel-1.4.3/configure 2012-08-24 08:45:58.684085341 +0200
+@@ -4986,7 +4986,7 @@
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
@@ -10,7 +10,7 @@ diff -ru gpsbabel-1.4.2/configure gpsbabel-1.4.2-shapelib/configure
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -5504,7 +5504,6 @@
+@@ -5550,7 +5550,6 @@
"tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;;
"win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;;
"jeeps/Makefile") CONFIG_FILES="$CONFIG_FILES jeeps/Makefile" ;;
@@ -18,10 +18,10 @@ diff -ru gpsbabel-1.4.2/configure gpsbabel-1.4.2-shapelib/configure
"zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-diff -ru gpsbabel-1.4.2/configure.in gpsbabel-1.4.2-shapelib/configure.in
---- 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 @@
+diff -Naur gpsbabel-1.4.3.orig/configure.in gpsbabel-1.4.3/configure.in
+--- gpsbabel-1.4.3.orig/configure.in 2012-01-28 22:59:29.000000000 +0100
++++ gpsbabel-1.4.3/configure.in 2012-08-24 08:45:58.685085358 +0200
+@@ -430,6 +430,6 @@
else
AC_MSG_RESULT(no)
fi
@@ -29,9 +29,9 @@ diff -ru gpsbabel-1.4.2/configure.in gpsbabel-1.4.2-shapelib/configure.in
+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
-diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-shapelib/Makefile.in
---- 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
+diff -Naur gpsbabel-1.4.3.orig/Makefile.in gpsbabel-1.4.3/Makefile.in
+--- gpsbabel-1.4.3.orig/Makefile.in 2012-01-28 22:59:29.000000000 +0100
++++ gpsbabel-1.4.3/Makefile.in 2012-08-24 08:45:58.686085375 +0200
@@ -87,7 +87,7 @@
@PALM_DB_CMT at PALM_DB=pdbfile.o
@@ -41,7 +41,7 @@ diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-shapelib/Makefile.in
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 @@
+@@ -825,8 +825,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 \
@@ -51,7 +51,7 @@ diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-shapelib/Makefile.in
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 @@
+@@ -1099,8 +1098,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
@@ -60,9 +60,9 @@ diff -ru gpsbabel-1.4.2/Makefile.in gpsbabel-1.4.2-shapelib/Makefile.in
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 \
-diff -ru gpsbabel-1.4.2/shape.c gpsbabel-1.4.2-shapelib/shape.c
---- 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
+diff -Naur gpsbabel-1.4.3.orig/shape.c gpsbabel-1.4.3/shape.c
+--- gpsbabel-1.4.3.orig/shape.c 2011-11-20 21:14:08.000000000 +0100
++++ gpsbabel-1.4.3/shape.c 2012-08-24 08:45:58.686085375 +0200
@@ -20,7 +20,7 @@
*/
diff --git a/gpsbabel.spec b/gpsbabel.spec
index f24bfaa..cfd1be4 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -1,6 +1,6 @@
Name: gpsbabel
-Version: 1.4.2
-Release: 8%{?dist}
+Version: 1.4.4
+Release: 1%{?dist}
Summary: A tool to convert between various formats used by GPS devices
Group: Applications/Text
@@ -22,15 +22,19 @@ URL: http://www.gpsbabel.org
# Successfully downloaded tarball: gpsbabel-1.4.2.tar.gz
# $
Source0: %{name}-%{version}.tar.gz
-Source1: %{name}.desktop
Source2: %{name}.png
Source21: http://www.gpsbabel.org/style3.css
-# Avoid calling autoconf from the Makefile
-Patch0: gpsbabel-1.3.5-autoconf.patch
# Use system shapelib - not suitable for upstream in this form.
-Patch11: gpsbabel-1.4.2-use-system-shapelib.patch
+Patch11: gpsbabel-1.4.3-use-system-shapelib.patch
# Remove network access requirement for XML doc builds and HTML doc reading
Patch21: gpsbabel-1.4.2-xmldoc.patch
+# Pickup gmapbase.html from /usr/share/gpsbabel
+Patch22: gpsbabel-1.4.3-gmapbase.patch
+# No automatic phone home by default (RHBZ 668865)
+Patch23: gpsbabel-1.4.3-nosolicitation.patch
+# Fix invalid gzFile pointer use
+Patch24: gpsbabel-1.4.3-gzip.diff
+
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%global translationdir %{_datadir}/qt4/translations
@@ -75,15 +79,28 @@ Qt GUI interface for GPSBabel
%prep
%setup -q
-# Avoid calling autoconf from Makefile
-%patch0 -p1 -b .remove-autoconf-from-Makefile
# Use system shapelib instead of bundled partial shapelib
rm -rf shapelib
-%patch11 -p1 -b .use-system-shapelib
+%patch11 -p1
# Remove network access requirement for XML doc builds and HTML doc reading
-%patch21 -p1 -b .xmldoc
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+
+# Get rid of bundled zlib
+# configure --with-zlib=system is not enough,
+# building still accesses bundled zlib headers
+rm -rf zlib/*
+touch zlib/empty.in
+sed -i -e 's, zlib/[^ ]*,,g' -e '/^zlib*/d' -e 's, jeeps/../zlib/[^ ]*,,g' Makefile.in
+
+
cp -p %{SOURCE21} gpsbabel.org-style3.css
+# Avoid calling autoconf from Makefile
+touch -r configure.in configure Makefile.in
+
# fix bad execute perms
find . -type f \( -name '*.c' -or -name '*.h' -or -name '*.cpp' \) -print0 |
xargs -0 chmod a-x
@@ -114,9 +131,12 @@ install -m 0755 -p gui/objects/gpsbabelfe-bin %{buildroot}%{_bindir}/
install -m 0755 -d %{buildroot}%{translationdir}/
install -m 0644 -p gui/gpsbabel*_*.qm %{buildroot}%{translationdir}/
+install -m 0755 -d %{buildroot}%{_datadir}/gpsbabel
+install -m 0644 -p gui/gmapbase.html %{buildroot}%{_datadir}/gpsbabel
+
desktop-file-install \
--dir %{buildroot}/%{_datadir}/applications \
- %{SOURCE1}
+ gui/gpsbabel.desktop
install -m 0755 -d %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
@@ -150,13 +170,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%if 0%{?build_gui}
%files gui -f %{name}.lang
%defattr(-,root,root,-)
-%doc gui/{AUTHORS,COPYING,README*,TODO}
+%doc gui/{AUTHORS,COPYING*,README*,TODO}
%{_bindir}/gpsbabelfe-bin
+%{_datadir}/gpsbabel
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/256x256/apps/*
%endif
%changelog
+* Mon Sep 17 2012 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.4.4-1
+- Upstream update.
+- Rebase patches.
+- Use upstream gpsbabel.desktop.
+- Address RHBZ 668865.
+- Fix gzFile pointer abuse.
+- Install gmapbase.html to /usr/share/gpsbabel.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index cdfdd26..29585c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-993d828189a53b353b9606fa45fe9480 style3.css
-76ea9f7852be2e98aa18976c4697ca93 gpsbabel-1.4.2.tar.gz
+6c4c8f0cb9fcf9f8302585148878f174 gpsbabel-1.4.4.tar.gz
More information about the scm-commits
mailing list