diff --git a/.gitignore b/.gitignore index d78360d..97106ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ +/viking-*.tar.bz2 /autogen.sh -/viking-1.11.tar.gz -/viking-viking-1.11.tar.gz -/viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz +/443fe78cb097ae2196517fc726595b57cb9418c4.patch \ No newline at end of file diff --git a/sources b/sources index 841d50b..2c8b87a 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz) = 94eb5f5f211ed4f1645a0b7b4d9ce3adeaffdf1502f3a9367bc99a37b9ad2e739337b7920766ac5b9719aca1ad95fab368b8343550420fda5cebbdcce5cdc795 +SHA512 (viking-1.10.tar.bz2) = d04877306fb3a4e6902297d8971ca72d30418727f110b8b9bc937b2738b95975a7f41a4c969cc19cf403e73339476ff46d7ccbae77e03c5b1cf5bcac891485e5 +SHA512 (autogen.sh) = 66f4f4ffbc7dc2343918c7fb0d58e3d503d811d71b655f435b3d5bdf6ac5fbe304a349ddc5370a53c2fb5bc4142707e7eab160c35038ca82aadc13294eb02ea0 +SHA512 (443fe78cb097ae2196517fc726595b57cb9418c4.patch) = 0101392cdeaa52d03ac092a83968ab59380e65671bc2988d97ba148e7e89c566f3aa520320b5410a4aec943b4c0cd15fb092be30a05e7bd1c8b6a01032f3ef0d diff --git a/viking.spec b/viking.spec index f5d0e5d..02009d2 100644 --- a/viking.spec +++ b/viking.spec @@ -1,22 +1,18 @@ Name: viking - -%global forgeurl https://github.com/viking-gps/viking -%global version0 1.11 -%global commit 2a2420963e4b913d0b37dcf8801dc3695ca72a6c -%forgemeta -Version: %forgeversion +Version: 1.10 Release: %autorelease Summary: GPS data editor and analyzer License: GPL-2.0-or-later -URL: %forgeurl - -Source0: %forgesource - +URL: https://viking.sourceforge.net/ +Source0: https://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2 +# SourceForge is not good for fetching individual files and patches. Resort to +# upstream's GitHub mirror. +Source1: https://raw.githubusercontent.com/viking-gps/viking/refs/tags/viking-%{version}/autogen.sh +Patch: https://github.com/viking-gps/viking/commit/443fe78cb097ae2196517fc726595b57cb9418c4.patch # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86} -BuildRequires: autoconf BuildRequires: make BuildRequires: gcc-c++ BuildRequires: intltool @@ -30,7 +26,7 @@ BuildRequires: gnome-doc-utils BuildRequires: libexif-devel BuildRequires: bzip2-devel BuildRequires: file-devel -BuildRequires: libgexiv2_0.14-devel +BuildRequires: libgexiv2-devel BuildRequires: sqlite-devel BuildRequires: docbook-utils BuildRequires: docbook-style-xsl @@ -44,8 +40,6 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: json-glib-devel BuildRequires: yelp-tools -BuildRequires: xxd -BuildRequires: libnova-devel Requires: hicolor-icon-theme Requires: gpsbabel @@ -58,14 +52,17 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep -%forgeautosetup -p 1 -NOCONFIGURE=1 ./autogen.sh -# Convert TODO to utf-8 -mv TODO timestamp -iconv -f ISO-8859-1 -t UTF-8 -o TODO timestamp -touch -r timestamp TODO +%autosetup -p1 +cp %{SOURCE1} . && chmod +x autogen.sh +# Convert to utf-8 +for file in ChangeLog NEWS TODO; do + mv $file timestamp + iconv -f ISO-8859-1 -t UTF-8 -o $file timestamp + touch -r timestamp $file +done %build +NOCONFIGURE=1 ./autogen.sh %configure %make_build CFLAGS="${RPM_OPT_FLAGS} -fcommon"