[gpx-viewer] update for newer champlain/gdl
Peter Robinson
pbrobinson at fedoraproject.org
Tue Oct 11 11:58:26 UTC 2011
commit 74157ecff9340c5d6ac44e8662d5dd2a2605a968
Author: Peter Robinson <pbrobinson at gmail.com>
Date: Tue Oct 11 12:58:23 2011 +0100
update for newer champlain/gdl
gpx-viewer-0.2.0-configure.patch | 101 -----------------------------------
gpx-viewer-configure.patch | 107 --------------------------------------
gpx-viewer-include.patch | 11 ----
gpx-viewer-linking.patch | 11 ----
gpx-viewer-vala.patch | 11 ----
gpx-viewer.spec | 18 +++---
6 files changed, 9 insertions(+), 250 deletions(-)
---
diff --git a/gpx-viewer.spec b/gpx-viewer.spec
index 96aff83..371b04b 100644
--- a/gpx-viewer.spec
+++ b/gpx-viewer.spec
@@ -1,14 +1,12 @@
Name: gpx-viewer
Version: 0.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A simple gpx viewer
Group: Applications/Internet
License: GPLv2+
URL: https://edge.launchpad.net/gpx-viewer
Source0: http://edge.launchpad.net/gpx-viewer/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-Patch0: %{name}-%{version}-configure.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: libchamplain-devel
@@ -21,6 +19,9 @@ BuildRequires: unique-devel
BuildRequires: desktop-file-utils
BuildRequires: intltool
+# Require due to lib versions changes
+BuildRequires: autoconf libtool gnome-common
+
Requires: hicolor-icon-theme
@@ -31,8 +32,12 @@ intention to become a full blown manager, editor or analyzer.
%prep
%setup -q
-%patch0 -p1 -b .configure
+sed -i.champlain 's/champlain-0.4 >= 0.4.3/champlain-0.12 >= 0.12.0/' configure.ac
+sed -i.champlain-gtk 's/champlain-gtk-0.4 >= 0.4.3/champlain-gtk-0.12 >= 0.12.0/' configure.ac
+sed -i.gdl 's/gdl-1.0/gdl-3.0/' configure.ac
+
+autoreconf
%build
%configure --disable-static
@@ -40,16 +45,11 @@ make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL="install -p"
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
%find_lang %{name}
-%clean
-rm -rf %{buildroot}
-
-
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
More information about the scm-commits
mailing list