From 74157ecff9340c5d6ac44e8662d5dd2a2605a968 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Oct 11 2011 11:58:23 +0000 Subject: update for newer champlain/gdl --- diff --git a/gpx-viewer-0.2.0-configure.patch b/gpx-viewer-0.2.0-configure.patch deleted file mode 100644 index 15e5cce..0000000 --- a/gpx-viewer-0.2.0-configure.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- gpx-viewer-0.2.0/configure.orig 2010-09-07 10:27:49.194405271 +0200 -+++ gpx-viewer-0.2.0/configure 2010-09-07 10:31:18.417405356 +0200 -@@ -12146,8 +12146,8 @@ - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12155,8 +12155,8 @@ - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12167,8 +12167,8 @@ - test $ac_status = 0; }; then - pkg_cv_modules_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12188,8 +12188,8 @@ - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12197,8 +12197,8 @@ - \""; } >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12209,8 +12209,8 @@ - test $ac_status = 0; }; then - pkg_cv_modules_LIBS=`$PKG_CONFIG --libs " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12236,8 +12236,8 @@ - if test $_pkg_short_errors_supported = yes; then - modules_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12246,8 +12246,8 @@ - else - modules_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 -@@ -12259,8 +12259,8 @@ - - as_fn_error "Package requirements ( - gtk+-2.0 >= 2.16 -- champlain-gtk-0.4 >= 0.4.3 -- champlain-0.4 >= 0.4.3 -+ champlain-gtk-0.6 >= 0.4.3 -+ champlain-0.6 >= 0.4.3 - gmodule-2.0 - libxml-2.0 - gdl-1.0 diff --git a/gpx-viewer-configure.patch b/gpx-viewer-configure.patch deleted file mode 100644 index 6872bfb..0000000 --- a/gpx-viewer-configure.patch +++ /dev/null @@ -1,107 +0,0 @@ ---- gpx-viewer-0.1.1/configure.orig 2009-10-10 11:40:38.633602463 +0200 -+++ gpx-viewer-0.1.1/configure 2009-10-10 11:42:06.644601903 +0200 -@@ -13827,15 +13827,15 @@ - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - ") 2>&5 -@@ -13844,8 +13844,8 @@ - (exit $ac_status); }; then - pkg_cv_modules_CFLAGS=`$PKG_CONFIG --cflags " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - " 2>/dev/null` -@@ -13863,15 +13863,15 @@ - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - ") 2>&5 -@@ -13880,8 +13880,8 @@ - (exit $ac_status); }; then - pkg_cv_modules_LIBS=`$PKG_CONFIG --libs " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - " 2>/dev/null` -@@ -13905,16 +13905,16 @@ - if test $_pkg_short_errors_supported = yes; then - modules_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - "` - else - modules_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - "` -@@ -13924,8 +13924,8 @@ - - { { $as_echo "$as_me:$LINENO: error: Package requirements ( - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - ) were not met: -@@ -13941,8 +13941,8 @@ - " >&5 - $as_echo "$as_me: error: Package requirements ( - gtk+-2.0 >= 2.16 -- champlain-gtk-0.3 >= 0.3.3 -- champlain-0.3 >= 0.3.3 -+ champlain-gtk-0.4.6 -+ champlain-0.4.6 - gmodule-2.0 - libxml-2.0 - ) were not met: diff --git a/gpx-viewer-include.patch b/gpx-viewer-include.patch deleted file mode 100644 index f7dce04..0000000 --- a/gpx-viewer-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpx-viewer-0.1.1/src/gpx-viewer.c.orig 2009-10-10 11:49:05.467610255 +0200 -+++ gpx-viewer-0.1.1/src/gpx-viewer.c 2009-10-10 11:49:33.596602731 +0200 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include "gpx.h" - //#include "gpx-graph.h" - diff --git a/gpx-viewer-linking.patch b/gpx-viewer-linking.patch deleted file mode 100644 index 2be9e6a..0000000 --- a/gpx-viewer-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpx-viewer-0.1.2/Makefile.in.orig 2010-04-07 23:31:17.186132358 +0200 -+++ gpx-viewer-0.1.2/Makefile.in 2010-04-07 23:31:30.776132380 +0200 -@@ -208,7 +208,7 @@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = \ -- @modules_LIBS@ -+ @modules_LIBS@ -lm - - LIBTOOL = @LIBTOOL@ - LIPO = @LIPO@ diff --git a/gpx-viewer-vala.patch b/gpx-viewer-vala.patch deleted file mode 100644 index 83b6de1..0000000 --- a/gpx-viewer-vala.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gpx-viewer-0.1.2/src/gpx-graph.vala.orig 2010-04-07 23:26:35.419132387 +0200 -+++ gpx-viewer-0.1.2/src/gpx-graph.vala 2010-04-07 23:27:00.154132017 +0200 -@@ -51,7 +51,7 @@ - /* Force a redraw */ - this.queue_draw(); - } -- default = 4; -+ /* default = 4; */ - } - - public Graph () 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 || :