[gpsbabel] gpsbabel-1.4.2-2
Hans Ulrich Niedermann
ndim at fedoraproject.org
Tue Jan 11 21:22:22 UTC 2011
commit 744177b37f5dc0be86a8d58c5cc5a30cd551a189
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Tue Jan 11 22:21:42 2011 +0100
gpsbabel-1.4.2-2
* Tue Jan 11 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.2-2
- Shut up desktop-file-install warnings
- Comment the patches in the spec file
gpsbabel.desktop | 4 ++--
gpsbabel.spec | 13 +++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/gpsbabel.desktop b/gpsbabel.desktop
index 877abef..4ae4525 100644
--- a/gpsbabel.desktop
+++ b/gpsbabel.desktop
@@ -3,7 +3,7 @@ Type=Application
Name=GPSBabel
Comment=Qt GUI interface for GPSBabel
GenericName=GPSBabel
-Icon=gpsbabel.png
+Icon=gpsbabel
Exec=gpsbabelfe-bin
Terminal=false
-Categories=Geography;Utility
+Categories=Geography;Education;Utility;
diff --git a/gpsbabel.spec b/gpsbabel.spec
index 91a0291..34a803f 100644
--- a/gpsbabel.spec
+++ b/gpsbabel.spec
@@ -1,6 +1,6 @@
Name: gpsbabel
Version: 1.4.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A tool to convert between various formats used by GPS devices
Group: Applications/Text
@@ -21,8 +21,11 @@ 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
+# Remove network access requirement for XML doc builds and HTML doc reading
Patch21: gpsbabel-1.4.2-xmldoc.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -51,11 +54,13 @@ 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
+# Remove network access requirement for XML doc builds and HTML doc reading
%patch21 -p1 -b .xmldoc
-
cp -p %{SOURCE21} style3.css
# fix bad execute perms
@@ -117,6 +122,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/256x256/apps/*
%changelog
+* Tue Jan 11 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.2-2
+- Shut up desktop-file-install warnings
+- Comment the patches in the spec file
+
* Tue Jan 11 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.4.2-1
- Update to 1.4.2
- Document how to get source tarball via HTTP POST
More information about the scm-commits
mailing list