Hello community,
here is the log from the commit of package gpsbabel for openSUSE:Factory checked in at 2015-06-02 10:04:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gpsbabel (Old)
and /work/SRC/openSUSE:Factory/.gpsbabel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gpsbabel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gpsbabel/gpsbabel.changes 2015-05-28 09:56:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gpsbabel.new/gpsbabel.changes 2015-06-02 10:04:57.000000000 +0200
@@ -1,0 +2,31 @@
+Sun May 31 17:33:36 UTC 2015 - tchvatal@suse.com
+
+- Use qmake macro and obey cflags
+
+-------------------------------------------------------------------
+Fri May 29 08:49:30 UTC 2015 - dgutu@suse.com
+
+- Defined icon and translation directories in %files section
+ on spec file
+
+-------------------------------------------------------------------
+Thu May 28 15:28:54 UTC 2015 - dgutu@suse.com
+
+- Spec file modified to refrect changes about icon and desktop file
+- Added the gpsbabel.png
+
+-------------------------------------------------------------------
+Thu May 28 14:27:29 UTC 2015 - dgutu@suse.com
+
+- Added missing packages for gui version to spec file
+ * libqt5-qtwebkit
+ * shapelib-devel
+ * update-desktop-files
+ * autoconf
+- Added patches
+ * 0002-gpsbabel-1.4.3-use-system-shapelib.patch
+ * 0003-gpsbabel-1.4.3-gmapbase.patch
+ * 0004-gpsbabel-1.4.3-nosolicitation.patch
+ * 0006-Use-system-zlib.patch
+
+-------------------------------------------------------------------
New:
----
0002-gpsbabel-1.4.3-use-system-shapelib.patch
0003-gpsbabel-1.4.3-gmapbase.patch
0004-gpsbabel-1.4.3-nosolicitation.patch
0006-Use-system-zlib.patch
gpsbabel.png
style3.css
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gpsbabel.spec ++++++
--- /var/tmp/diff_new_pack.d7WFVy/_old 2015-06-02 10:04:58.000000000 +0200
+++ /var/tmp/diff_new_pack.d7WFVy/_new 2015-06-02 10:04:58.000000000 +0200
@@ -16,23 +16,41 @@
#
+%global translationdir %{_datadir}/qt5/translations
Name: gpsbabel
-Url: http://www.gpsbabel.org/
Version: 1.5.2
Release: 0
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Converts GPS waypoint, route and track data from one format type to another
License: GPL-2.0+
Group: Hardware/Other
+Url: http://www.gpsbabel.org/
Source: %{name}-%{version}.tar.gz
Source1: http://www.gpsbabel.org/htmldoc-1.5.0/%{name}-1.5.0.pdf
-BuildRequires: libexpat-devel
+Source21: style3.css
+Source2: %{name}.png
+# Use system shapelib - not suitable for upstream in this form.
+Patch2: 0002-gpsbabel-1.4.3-use-system-shapelib.patch
+# Pickup gmapbase.html from /usr/share/gpsbabel
+Patch3: 0003-gpsbabel-1.4.3-gmapbase.patch
+# No automatic phone home by default (RHBZ 668865)
+Patch4: 0004-gpsbabel-1.4.3-nosolicitation.patch
+# Use system zlib
+Patch6: 0006-Use-system-zlib.patch
+BuildRequires: autoconf
BuildRequires: libqt5-qtbase-devel
-BuildRequires: libqt5-qttools-devel
BuildRequires: libusb-devel
-BuildRequires: zlib-devel
-#only for rebuilding documentation
-#BuildRequires: expat libxslt docbook-xsl-stylesheets fop java-1_6_0-sun
+BuildRequires: shapelib-devel
+BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(Qt5CLucene)
+BuildRequires: pkgconfig(Qt5Designer)
+BuildRequires: pkgconfig(Qt5DesignerComponents)
+BuildRequires: pkgconfig(Qt5Help)
+BuildRequires: pkgconfig(Qt5UiTools)
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
+BuildRequires: pkgconfig(expat)
+BuildRequires: pkgconfig(zlib)
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
GPSBabel converts waypoints, tracks, and routes from one format to
@@ -51,24 +69,88 @@
data that may (or may not be) placed on a map, such as waypoints,
tracks, and routes.
+%package gui
+Summary: Qt GUI interface for GPSBabel
+Group: Applications/Engineering
+Requires: %{name} = %{version}-%{release}
+
+%description gui
+Qt GUI interface for GPSBabel
+
%prep
%setup -q
+# Use system shapelib instead of bundled partial shapelib
+rm -rf shapelib
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -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
+
+cp -p %{SOURCE21} gpsbabel.org-style3.css
+
+# Avoid calling autoconf from Makefile
+touch -r configure.in configure Makefile.in
+
+# Fixup categories for .desktop file
+sed -i \
+ -e 's:Utility;::g' \
+ gui/gpsbabel.desktop
%build
export CXXFLAGS="%{optflags} -fPIC"
%configure\
--with-zlib=system
-make
-#only for rebuilding documentation
-#make doc
-cp %{S:1} %{name}.pdf
+make %{?_smp_mflags}
+cp %{SOURCE1} %{name}.pdf
+
+pushd gui
+CFLAGS="%{optflags}" \
+%qmake5 PREFIX=%{_prefix}
+lrelease-qt5 *.ts
+make %{?_smp_mflags}
+popd
%install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
+make -C gui DESTDIR=%{buildroot} install
+
+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}/applications
+install -m 0644 gui/gpsbabel.desktop %{buildroot}/%{_datadir}/applications
+
+install -m 0755 -d %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+install -m 0644 -p %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/
+
+%find_lang %{name} --with-qt --all-name
+
+%post gui
+%icon_theme_cache_post
+%desktop_database_post
+
+%postun gui
+%icon_theme_cache_postun
+%desktop_database_postun
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README* %{name}.pdf
%{_bindir}/gpsbabel
+%{_bindir}/gpsbabelfe-bin
+%{_datadir}/applications/*
+%dir %{translationdir}/
+%{translationdir}/*
+%dir %{_datadir}/icons/hicolor/256x256/
+%dir %{_datadir}/icons/hicolor/256x256/apps/
+%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
%changelog
++++++ 0002-gpsbabel-1.4.3-use-system-shapelib.patch ++++++
From 4aaaa1f23720240572cf1f18811993d3c5ccda5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Tue, 15 Apr 2014 05:18:38 +0200
Subject: [PATCH 2/6] gpsbabel-1.4.3-use-system-shapelib
Use system shapelib - not suitable for upstream in this form.
---
Makefile.in | 8 ++------
configure | 3 +--
configure.in | 2 +-
shape.cc | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
Index: gpsbabel-1.5.2/Makefile.in
===================================================================
--- gpsbabel-1.5.2.orig/Makefile.in
+++ gpsbabel-1.5.2/Makefile.in
@@ -100,7 +100,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
# 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 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 \
@@ -113,7 +113,7 @@ LIBOBJS = queue.o route.o waypt.o filter
inifile.o garmin_fs.o gbsleep.o units.o @GBSER@ gbser.o \
gbfile.o parse.o session.o src/core/xmlstreamwriter.o \
src/core/usasciicodec.o \
- $(PALM_DB) $(GARMIN) $(JEEPS) $(SHAPE) @ZLIB@ $(FMTS) $(FILTERS)
+ $(PALM_DB) $(GARMIN) $(JEEPS) @ZLIB@ $(FMTS) $(FILTERS)
OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
DEPFILES = $(OBJS:.o=.d)
@@ -141,10 +141,10 @@ gui linux-gui mac-gui mac-gui-dmg msvc-b
all: gpsbabel$(EXEEXT)
gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ $(QT_LIBS) $(SHAPE) @USB_LIBS@ $(OUTPUT_SWITCH)$@
gpsbabel-debug: $(OBJS)
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) @USB_LIBS@ $(OUTPUT_SWITCH)$@
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ $(QT_LIBS) $(SHAPE) @USB_LIBS@ $(OUTPUT_SWITCH)$@
Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in \
gbversion.h.in gui/setup.iss.in
@@ -880,11 +880,7 @@ sbp.o: sbp.cc defs.h config.h queue.h zl
session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
gbfile.h cet.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 inifile.h session.h src/core/datetime.h \
- shapelib/shapefil.h
-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 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 inifile.h session.h src/core/datetime.h
skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \
Index: gpsbabel-1.5.2/configure
===================================================================
--- gpsbabel-1.5.2.orig/configure
+++ gpsbabel-1.5.2/configure
@@ -5183,7 +5183,7 @@ done
-ac_config_files="$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="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty"
ac_config_files="$ac_config_files gui/makelinuxdist.sh"
@@ -5886,7 +5886,6 @@ do
"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" ;;
- "shapelib/Makefile") CONFIG_FILES="$CONFIG_FILES shapelib/Makefile" ;;
"zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;;
"gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;;
Index: gpsbabel-1.5.2/configure.in
===================================================================
--- gpsbabel-1.5.2.orig/configure.in
+++ gpsbabel-1.5.2/configure.in
@@ -397,7 +397,7 @@ AC_SUBST(QT_INC_OPT)
AC_SUBST(QT_SYSINC_OPT)
AC_SUBST(QT_LIBS)
-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
Index: gpsbabel-1.5.2/shape.cc
===================================================================
--- gpsbabel-1.5.2.orig/shape.cc
+++ gpsbabel-1.5.2/shape.cc
@@ -20,7 +20,7 @@
*/
#include "defs.h"
-#include "shapelib/shapefil.h"
+#include
#include
#if SHAPELIB_ENABLED
++++++ 0003-gpsbabel-1.4.3-gmapbase.patch ++++++
From 563b847b51bd225df3585b9740fa6f678fb2f26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Tue, 15 Apr 2014 05:20:16 +0200
Subject: [PATCH 3/6] gpsbabel-1.4.3-gmapbase
Pickup gmapbase.html from /usr/share/gpsbabel.
---
gui/map.cc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gui/map.cc b/gui/map.cc
index 3284376..dc8cec8 100644
--- a/gui/map.cc
+++ b/gui/map.cc
@@ -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"));
--
2.1.0
++++++ 0004-gpsbabel-1.4.3-nosolicitation.patch ++++++
From e08271b2674ccdcad9a27833cb79c52188ef208a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?=
Date: Tue, 15 Apr 2014 05:21:09 +0200
Subject: [PATCH 4/6] gpsbabel-1.4.3-nosolicitation
No automatic phone home by default (RHBZ 668865).
---
gui/babeldata.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gui/babeldata.h b/gui/babeldata.h
index 0619d69..0fdc8d2 100644
--- a/gui/babeldata.h
+++ b/gui/babeldata.h
@@ -63,8 +63,8 @@ public:
upgradeErrors_(0),
upgradeOffers_(0),
runCount_(0),
- startupVersionCheck_(true),
- reportStatistics_(true),
+ startupVersionCheck_(false),
+ reportStatistics_(false),
allowBetaUpgrades_(false),
ignoreVersionMismatch_(false),
disableDonateDialog_(false),
--
2.1.0
++++++ 0006-Use-system-zlib.patch ++++++
++++ 864 lines (skipped)
++++++ style3.css ++++++
body {
background-color: #ccffff;
position: relative;
margin-top: 0px;
margin-bottom: 0px;
margin-left: 10px;
margin-right: 10px;
}
div#content {
position: absolute;
overflow: auto;
top: 20px;
left: 11em;
/* Explictly set right: so that IE won't underlay text under right div */
right: 190px;
/* margin-right: 180px; */
/* padding: 10px; */
color: #000000;
}
p.doc-footer {
/* color: red; */
border: 1px solid;
padding: 10px;
background: #ccffd0;
}
/* As above, but split for right column content */
div#scontent {
position: absolute;
top: 20px;
left: 11em;
right: 27%;
color: #000000;
}
div#news {
position: absolute;
top: 80px;
right: 1px;
width: 180px;
font-size: smaller;
}
div#adsense {
/* position: absolute;
top: 80px;
right: 1px;
width: 180px;
padding: 5px; */
float: right;
margin: 10px;
clear: left;
}
div#links {
position: absolute;
top: 80px;
left: 0;
width: 10em;
z-index: 30;
color: #ccffff;
margin: 0 0 1px;
background-color: #333399;
font-weight: bold;
}
div#logo {
position: absolute;
width: 150px;
text-align: center;
}
div#links a {
color: #ffffff;
text-decoration: none;
display: block;
/* text-align: center; */
margin: 0 0 1px;
/* font-size: larger; */
}
div#links a:hover {
color: #ffcc33;
/* font-size: larger; */
}
/* Used in makedoc.in for the individual pages in doc. */
p.fmtcapshdr {
font-size: smaller;
}
p.fmtcapsitem {
font-size: smaller;
}
.command,.userinput {
/* Come back to this and find a 'prettier' style. */
/* color: red; */
/* width: 100%; */
border: 1px dashed;
display: block;
/* font-family: monospace; */
overflow: auto;
background-color: #E5E9EB;
padding : 10px;
}
.programlisting {
font-family: monospace;
overflow: auto;
}
/*
// Used in readme.xml for screen samples.
*/
.screen {
/* color: #ff0000; */
font-family: monospace,"New Courier";
margin-left: 5em;
}
h1 {
/* margin : -9px -9px 0.5em; */
padding : 15px 0px 5px;
text-align: center;
vertical-align: middle;
}
.adblock300x250left {
float: left;
height: 250px;
width: 300px;
margin-bottom: 10px;
margin-left: 0px;
margin-top: 20px;
margin-right: 15px;
}