From 20fca65cf9bbd37806501cc18387dbc3e29f23d3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:42:06 +0000 Subject: [PATCH 01/31] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- viking.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/viking.spec b/viking.spec index 3381e73..ed62565 100644 --- a/viking.spec +++ b/viking.spec @@ -9,6 +9,7 @@ Source0: http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz #Patch0: path-to-manpages-docbook-xsl.patch ExcludeArch: s390 s390x +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: expat-devel From e7473a21729d40cbcc7d8f91e23fdf6141c57443 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 14 Jan 2021 20:58:00 +0100 Subject: [PATCH 02/31] * Thu Jan 14 2021 Fabian Affolter - 1.8-4 - Rebuild (gpsd) --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index ed62565..5acf90a 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Thu Jan 14 2021 Fabian Affolter - 1.8-4 +- Rebuild (gpsd) + * Wed Jul 29 2020 Fedora Release Engineering - 1.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cf3caa885ae539bff78e4b58248a3f18ed346d74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:03:14 +0000 Subject: [PATCH 03/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 5acf90a..8509e82 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 14 2021 Fabian Affolter - 1.8-4 - Rebuild (gpsd) From 37fd9e9329acc83950b935ce99a1f0b4fbb58426 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:27:14 +0000 Subject: [PATCH 04/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 8509e82..ad21446 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 68656f19f0c87fef6fc2ae7cb355ab2fda41bdf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 11 Aug 2021 18:09:35 +0200 Subject: [PATCH 05/31] Rebuild (gpsd) --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index ad21446..48a1b1c 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Wed Aug 11 2021 Björn Esser - 1.8-7 +- Rebuild (gpsd) + * Fri Jul 23 2021 Fedora Release Engineering - 1.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 145316e8ab77f20f33b6934f85fcbdf13516731d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:57:25 +0000 Subject: [PATCH 06/31] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 48a1b1c..b0551f4 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Aug 11 2021 Björn Esser - 1.8-7 - Rebuild (gpsd) From 116f416eb9622bde6e5058cdd11f814387fff189 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 6 May 2022 22:42:03 +0900 Subject: [PATCH 07/31] Rebuild for new gpsd --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index b0551f4..3c09ff7 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Fri May 06 2022 Mamoru TASAKA - 1.8-9 +- Rebuild for new gpsd + * Sat Jan 22 2022 Fedora Release Engineering - 1.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7c7ba64e73274fd782987bbe490aebb4c92efaaa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:51:49 +0000 Subject: [PATCH 08/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 3c09ff7..3a0ab31 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri May 06 2022 Mamoru TASAKA - 1.8-9 - Rebuild for new gpsd From cd295f234b3542a3d83a4a4f0e25715e593e7b68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:16:50 +0000 Subject: [PATCH 09/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 3a0ab31..2024d49 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 10%{?dist} +Release: 11%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b5b5ca99e4fe0a190fb763cfc154d7aa3c67edb7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 23 Jan 2023 18:22:04 -0800 Subject: [PATCH 10/31] rebuild for new libgps --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 2024d49..676340e 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.8 -Release: 11%{?dist} +Release: 12%{?dist} Summary: GPS data editor and analyzer License: GPLv2+ @@ -81,6 +81,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Tue Jan 24 2023 Adam Williamson - 1.8-12 +- rebuild for new libgps + * Sat Jan 21 2023 Fedora Release Engineering - 1.8-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f5b2b0ea2938a5ca68e992479ff2bafcfacdaadf Mon Sep 17 00:00:00 2001 From: Troy Curtis Jr Date: Sun, 19 Feb 2023 15:32:45 -0500 Subject: [PATCH 11/31] Update to viking 1.10. --- .gitignore | 1 + sources | 2 +- viking.spec | 20 ++++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index a086ecf..6984984 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ viking-0.9.94.tar.gz /viking-1.6.2.tar.bz2 /viking-1.7.tar.bz2 /viking-1.8.tar.bz2 +/viking-1.10.tar.bz2 diff --git a/sources b/sources index 9233068..acac92e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viking-1.8.tar.bz2) = 0f30aded65a84c34fde6204b39ed652ece4218dadca76679244dbdfb655513c5f4b7cdc7f82dcb659e852bc88b27d0c9fff29511c5e30e9fbd46a8540b925d91 +SHA512 (viking-1.10.tar.bz2) = d04877306fb3a4e6902297d8971ca72d30418727f110b8b9bc937b2738b95975a7f41a4c969cc19cf403e73339476ff46d7ccbae77e03c5b1cf5bcac891485e5 diff --git a/viking.spec b/viking.spec index 676340e..1bab670 100644 --- a/viking.spec +++ b/viking.spec @@ -1,9 +1,9 @@ Name: viking -Version: 1.8 -Release: 12%{?dist} +Version: 1.10 +Release: 1%{?dist} Summary: GPS data editor and analyzer -License: GPLv2+ +License: GPL-2.0-or-later URL: http://viking.sourceforge.net/ Source0: http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2 #Patch0: path-to-manpages-docbook-xsl.patch @@ -15,7 +15,7 @@ BuildRequires: intltool BuildRequires: expat-devel BuildRequires: gdk-pixbuf2-devel BuildRequires: gpsd-devel -BuildRequires: gtk2-devel +BuildRequires: gtk3-devel BuildRequires: libcurl-devel BuildRequires: gtk-doc BuildRequires: gnome-doc-utils @@ -34,16 +34,15 @@ BuildRequires: nettle-devel BuildRequires: libzip-devel BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: json-glib-devel +BuildRequires: itstool Requires: hicolor-icon-theme Requires: gpsbabel Requires: expect %description -Viking is a free/open source program to manage GPS data. You can import -and plot tracks and waypoints, show OpenStreetMap and/or Terraserver maps -under it, download geocaches for an area on the map, make new tracks and -waypoints, see real-time GPS position, etc. +Viking is a free/open source program to manage GPS data. You can import, plot and create tracks, routes and waypoints, show OSM, Bing Aerial and other maps, geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep %autosetup @@ -81,6 +80,11 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sun Feb 19 2023 Troy Curtis, Jr. - 1.10-1 +- Update to 1.10 +- Update description to be more accurate to the latest version +- Use SPDX for the license field + * Tue Jan 24 2023 Adam Williamson - 1.8-12 - rebuild for new libgps From b46955c5b55744030ed88300b1c2c2580c719a81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:37:11 +0000 Subject: [PATCH 12/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 1bab670..3ec747c 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GPS data editor and analyzer License: GPL-2.0-or-later @@ -80,6 +80,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Feb 19 2023 Troy Curtis, Jr. - 1.10-1 - Update to 1.10 - Update description to be more accurate to the latest version From d363474126726ef039f6fed60f70ec358bcef4cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:44:24 +0000 Subject: [PATCH 13/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 3ec747c..b6c7026 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GPS data editor and analyzer License: GPL-2.0-or-later @@ -80,6 +80,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 231c639370c8104ce74859a55812fcf2222f4972 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:45:51 +0000 Subject: [PATCH 14/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- viking.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index b6c7026..0945191 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GPS data editor and analyzer License: GPL-2.0-or-later @@ -80,6 +80,9 @@ make test %{_mandir}/man1/%{name}.1* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 49e951ad3b3756402ff9097ce01e7d232ff84b9d Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 24 Sep 2024 22:21:00 +0300 Subject: [PATCH 15/31] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++ viking.spec | 248 +--------------------------------------------------- 2 files changed, 247 insertions(+), 246 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..fdd4e27 --- /dev/null +++ b/changelog @@ -0,0 +1,245 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Feb 19 2023 Troy Curtis, Jr. - 1.10-1 +- Update to 1.10 +- Update description to be more accurate to the latest version +- Use SPDX for the license field + +* Tue Jan 24 2023 Adam Williamson - 1.8-12 +- rebuild for new libgps + +* Sat Jan 21 2023 Fedora Release Engineering - 1.8-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri May 06 2022 Mamoru TASAKA - 1.8-9 +- Rebuild for new gpsd + +* Sat Jan 22 2022 Fedora Release Engineering - 1.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Aug 11 2021 Björn Esser - 1.8-7 +- Rebuild (gpsd) + +* Fri Jul 23 2021 Fedora Release Engineering - 1.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Fabian Affolter - 1.8-4 +- Rebuild (gpsd) + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jun 18 2020 Björn Esser - 1.8-2 +- Rebuild (gpsd) + +* Thu Mar 19 2020 Fabian Affolter - 1.8-1 +- Fix FTBFS (rhbz#1800235) +- Update to new upstream version 1.8 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jan 23 2020 Fabian Affolter - 1.7-5 +- Rebuild for gpsd + +* Sat Jul 27 2019 Fedora Release Engineering - 1.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 03 2019 Björn Esser - 1.7-3 +- Rebuild (gpsd) + +* Sun Feb 03 2019 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 22 2019 Fabian Affolter - 1.7-1 +- Update to new upstream version 1.7 + +* Fri Sep 28 2018 Federico Bruni - 1.6.2-8 +- Add man page and fix help files location (rhbz#1633836) + +* Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 04 2016 Fabian Affolter - 1.6.2-1 +- Update to new upstream version 1.6.2 + +* Wed Nov 25 2015 Fabian Affolter - 1.6.1-1 +- Fix for lock (rhbz#1258559, rhbz#1258095, rhbz#1229082) +- Update to new upstream version 1.6.1 + +* Sat Aug 15 2015 Till Maas - 1.6-4 +- Fix FTBFS (#1240039) +- Use %%license +- Remove unused mapnik-devel BR + +* Fri Jun 19 2015 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 07 2015 Fabian Affolter - 1.6-2 +- Add patch to fix issue with new gpsd (rhbz#1206642) + +* Wed May 06 2015 Fabian Affolter - 1.6-1 +- Update to new upstream version 1.6 + +* Sat Mar 07 2015 Fabian Affolter - 1.5.1-4 +- Rebuild (libgps) + +* Mon Aug 18 2014 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Fabian Affolter - 1.5.1-1 +- Update to new upstream version 1.5.1 + +* Thu Nov 28 2013 Fabian Affolter - 1.5-2 +- Rebuild for libgps + +* Fri Oct 18 2013 Fabian Affolter - 1.5-1 +- Update to new upstream version 1.5 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 29 2013 Fabian Affolter - 1.4.1-1 +- Update to new upstream version 1.4.1 + +* Tue Feb 19 2013 Fabian Affolter - 1.4-1 +- Update to new upstream version 1.4 + +* Fri Feb 15 2013 Fedora Release Engineering - 1.3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Oct 24 2012 Fabian Affolter - 1.3.2.1-1 +- Update to new upstream version 1.3.2.1 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jul 15 2012 Fabian Affolter - 1.3.1-1 +- Update to new upstream version 1.3.1 + +* Mon Apr 30 2012 Fabian Affolter - 1.3-2 +- Update requirements + +* Mon Apr 30 2012 Fabian Affolter - 1.3-1 +- Update to new upstream version 1.3 + +* Sat Feb 11 2012 Fabian Affolter - 1.2.2-3 +- Orphan BR + +* Sat Jan 14 2012 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Nov 08 2011 Fabian Affolter - 1.2.2-1 +- Curl patch removed (is now upstream) +- Update to new upstream version 1.2.2 + +* Tue Aug 23 2011 Tom Callaway - 1.2.1-1 +- Update to 1.2.1 +- Enable gpsd 2.96+ support +- Fix compile with curl 7.21.7 (curl/types.h is gone) + +* Fri Jun 03 2011 Fabian Affolter - 1.2-1 +- Update to new upstream version 1.2 + +* Sun Mar 06 2011 Fabian Affolter - 1.1-1 +- Update to new upstream version 1.1 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jan 28 2011 Fabian Affolter - 1.0.1-1 +- Update description to fix #673009 +- Update to new upstream version 1.0.1 + +* Sat Nov 20 2010 Fabian Affolter - 1.0-2 +- Remove patch, is now upstream + +* Sat Nov 20 2010 Fabian Affolter - 1.0-1 +- Add test suite +- Update to new upstream version 1.0 + +* Wed Nov 03 2010 Fabian Affolter - 0.9.96-1 +- Update to new upstream version 0.9.96 + +* Wed Sep 29 2010 jkeating - 0.9.95-3 +- Rebuilt for gcc bug 634757 + +* Sat Sep 18 2010 Tom "spot" Callaway - 0.9.95-2 +- Disable scrollkeeper + +* Tue Sep 07 2010 Fabian Affolter - 0.9.95-1 +- Remove old patch0 +- Add new BR +- Update to new upstream version 0.9.95 + +* Wed Jul 14 2010 Fabian Affolter - 0.9.94-1 +- Update file section +- Update DSOLinking patch +- Update to new upstream version 0.9.94 + +* Thu May 27 2010 Fabian Affolter - 0.9.93-1 +- Update to new upstream version 0.9.93 + +* Sun May 09 2010 Fabian Affolter - 0.9.91-4 +- Rebuilt for new gpsd release + +* Tue Apr 27 2010 Fabian Affolter - 0.9.91-3 +- New patch to fix DSOLinking (#565080) + +* Mon Mar 22 2010 Fabian Affolter - 0.9.91-2 +- Added patch to fix DSOLinking (#565080) + +* Sat Feb 27 2010 Fabian Affolter - 0.9.91-1 +- Update to new upstream version 0.9.91 + +* Sun Sep 13 2009 Fabian Affolter - 0.9.9-1 +- Update to new upstream version 0.9.9 + +* Sun Jul 26 2009 Fedora Release Engineering - 0.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Mar 31 2009 Tom "spot" Callaway - 0.9.8-2 +- use new gpsd header (gpsdclient.h) + +* Sat Mar 28 2009 Fabian Affolter - 0.9.8-1 +- Update to new upstream version, 0.9.8 + +* Wed Feb 25 2009 Fedora Release Engineering - 0.9.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Jan 24 2009 Fabian Affolter - 0.9.7-2 +- Add missing hicolor-icon-theme + +* Sat Jan 24 2009 Fabian Affolter - 0.9.7-1 +- Initial package for Fedora diff --git a/viking.spec b/viking.spec index 0945191..40fddbb 100644 --- a/viking.spec +++ b/viking.spec @@ -1,6 +1,6 @@ Name: viking Version: 1.10 -Release: 4%{?dist} +Release: %autorelease Summary: GPS data editor and analyzer License: GPL-2.0-or-later @@ -80,248 +80,4 @@ make test %{_mandir}/man1/%{name}.1* %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 1.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sun Feb 19 2023 Troy Curtis, Jr. - 1.10-1 -- Update to 1.10 -- Update description to be more accurate to the latest version -- Use SPDX for the license field - -* Tue Jan 24 2023 Adam Williamson - 1.8-12 -- rebuild for new libgps - -* Sat Jan 21 2023 Fedora Release Engineering - 1.8-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.8-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri May 06 2022 Mamoru TASAKA - 1.8-9 -- Rebuild for new gpsd - -* Sat Jan 22 2022 Fedora Release Engineering - 1.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Aug 11 2021 Björn Esser - 1.8-7 -- Rebuild (gpsd) - -* Fri Jul 23 2021 Fedora Release Engineering - 1.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Fabian Affolter - 1.8-4 -- Rebuild (gpsd) - -* Wed Jul 29 2020 Fedora Release Engineering - 1.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 18 2020 Björn Esser - 1.8-2 -- Rebuild (gpsd) - -* Thu Mar 19 2020 Fabian Affolter - 1.8-1 -- Fix FTBFS (rhbz#1800235) -- Update to new upstream version 1.8 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jan 23 2020 Fabian Affolter - 1.7-5 -- Rebuild for gpsd - -* Sat Jul 27 2019 Fedora Release Engineering - 1.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jul 03 2019 Björn Esser - 1.7-3 -- Rebuild (gpsd) - -* Sun Feb 03 2019 Fedora Release Engineering - 1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Jan 22 2019 Fabian Affolter - 1.7-1 -- Update to new upstream version 1.7 - -* Fri Sep 28 2018 Federico Bruni - 1.6.2-8 -- Add man page and fix help files location (rhbz#1633836) - -* Sat Jul 14 2018 Fedora Release Engineering - 1.6.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.6.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 04 2016 Fabian Affolter - 1.6.2-1 -- Update to new upstream version 1.6.2 - -* Wed Nov 25 2015 Fabian Affolter - 1.6.1-1 -- Fix for lock (rhbz#1258559, rhbz#1258095, rhbz#1229082) -- Update to new upstream version 1.6.1 - -* Sat Aug 15 2015 Till Maas - 1.6-4 -- Fix FTBFS (#1240039) -- Use %%license -- Remove unused mapnik-devel BR - -* Fri Jun 19 2015 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 07 2015 Fabian Affolter - 1.6-2 -- Add patch to fix issue with new gpsd (rhbz#1206642) - -* Wed May 06 2015 Fabian Affolter - 1.6-1 -- Update to new upstream version 1.6 - -* Sat Mar 07 2015 Fabian Affolter - 1.5.1-4 -- Rebuild (libgps) - -* Mon Aug 18 2014 Fedora Release Engineering - 1.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Fabian Affolter - 1.5.1-1 -- Update to new upstream version 1.5.1 - -* Thu Nov 28 2013 Fabian Affolter - 1.5-2 -- Rebuild for libgps - -* Fri Oct 18 2013 Fabian Affolter - 1.5-1 -- Update to new upstream version 1.5 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Apr 29 2013 Fabian Affolter - 1.4.1-1 -- Update to new upstream version 1.4.1 - -* Tue Feb 19 2013 Fabian Affolter - 1.4-1 -- Update to new upstream version 1.4 - -* Fri Feb 15 2013 Fedora Release Engineering - 1.3.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Oct 24 2012 Fabian Affolter - 1.3.2.1-1 -- Update to new upstream version 1.3.2.1 - -* Sun Jul 22 2012 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jul 15 2012 Fabian Affolter - 1.3.1-1 -- Update to new upstream version 1.3.1 - -* Mon Apr 30 2012 Fabian Affolter - 1.3-2 -- Update requirements - -* Mon Apr 30 2012 Fabian Affolter - 1.3-1 -- Update to new upstream version 1.3 - -* Sat Feb 11 2012 Fabian Affolter - 1.2.2-3 -- Orphan BR - -* Sat Jan 14 2012 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Nov 08 2011 Fabian Affolter - 1.2.2-1 -- Curl patch removed (is now upstream) -- Update to new upstream version 1.2.2 - -* Tue Aug 23 2011 Tom Callaway - 1.2.1-1 -- Update to 1.2.1 -- Enable gpsd 2.96+ support -- Fix compile with curl 7.21.7 (curl/types.h is gone) - -* Fri Jun 03 2011 Fabian Affolter - 1.2-1 -- Update to new upstream version 1.2 - -* Sun Mar 06 2011 Fabian Affolter - 1.1-1 -- Update to new upstream version 1.1 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jan 28 2011 Fabian Affolter - 1.0.1-1 -- Update description to fix #673009 -- Update to new upstream version 1.0.1 - -* Sat Nov 20 2010 Fabian Affolter - 1.0-2 -- Remove patch, is now upstream - -* Sat Nov 20 2010 Fabian Affolter - 1.0-1 -- Add test suite -- Update to new upstream version 1.0 - -* Wed Nov 03 2010 Fabian Affolter - 0.9.96-1 -- Update to new upstream version 0.9.96 - -* Wed Sep 29 2010 jkeating - 0.9.95-3 -- Rebuilt for gcc bug 634757 - -* Sat Sep 18 2010 Tom "spot" Callaway - 0.9.95-2 -- Disable scrollkeeper - -* Tue Sep 07 2010 Fabian Affolter - 0.9.95-1 -- Remove old patch0 -- Add new BR -- Update to new upstream version 0.9.95 - -* Wed Jul 14 2010 Fabian Affolter - 0.9.94-1 -- Update file section -- Update DSOLinking patch -- Update to new upstream version 0.9.94 - -* Thu May 27 2010 Fabian Affolter - 0.9.93-1 -- Update to new upstream version 0.9.93 - -* Sun May 09 2010 Fabian Affolter - 0.9.91-4 -- Rebuilt for new gpsd release - -* Tue Apr 27 2010 Fabian Affolter - 0.9.91-3 -- New patch to fix DSOLinking (#565080) - -* Mon Mar 22 2010 Fabian Affolter - 0.9.91-2 -- Added patch to fix DSOLinking (#565080) - -* Sat Feb 27 2010 Fabian Affolter - 0.9.91-1 -- Update to new upstream version 0.9.91 - -* Sun Sep 13 2009 Fabian Affolter - 0.9.9-1 -- Update to new upstream version 0.9.9 - -* Sun Jul 26 2009 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Mar 31 2009 Tom "spot" Callaway - 0.9.8-2 -- use new gpsd header (gpsdclient.h) - -* Sat Mar 28 2009 Fabian Affolter - 0.9.8-1 -- Update to new upstream version, 0.9.8 - -* Wed Feb 25 2009 Fedora Release Engineering - 0.9.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Jan 24 2009 Fabian Affolter - 0.9.7-2 -- Add missing hicolor-icon-theme - -* Sat Jan 24 2009 Fabian Affolter - 0.9.7-1 -- Initial package for Fedora +%autochangelog From 0ed2128c708c013ec432f30e739eb1c0a9809fec Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 24 Sep 2024 22:25:13 +0300 Subject: [PATCH 16/31] New maintainer's cleanup Cleanup done by me as the new maintainer: * Use HTTPS instead of plain HTTP in URLs * Remove commented out patch * Remove s390 from ExcludeArch, there is no such architecture on Fedora today * Whitespace and newline changes * Simplify .gitignore with glob fixup: cleanup --- .gitignore | 23 +---------------------- path-to-manpages-docbook-xsl.patch | 26 -------------------------- viking.spec | 22 ++++++++++++---------- 3 files changed, 13 insertions(+), 58 deletions(-) delete mode 100644 path-to-manpages-docbook-xsl.patch diff --git a/.gitignore b/.gitignore index 6984984..587ef6b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1 @@ -viking-0.9.94.tar.gz -/viking-0.9.95.tar.gz -/viking-0.9.96.tar.gz -/viking-1.0.tar.gz -/viking-1.0.1.tar.gz -/viking-1.1.tar.gz -/viking-1.2.tar.gz -/viking-1.2.1.tar.gz -/viking-1.2.2.tar.gz -/viking-1.3.tar.gz -/viking-1.3.1.tar.gz -/viking-1.3.2.1.tar.gz -/viking-1.4.tar.gz -/viking-1.4.1.tar.gz -/viking-1.5.tar.bz2 -/viking-1.5.1.tar.bz2 -/viking-1.6.tar.bz2 -/viking-1.6.1.tar.bz2 -/viking-1.6.2.tar.bz2 -/viking-1.7.tar.bz2 -/viking-1.8.tar.bz2 -/viking-1.10.tar.bz2 +/viking-*.tar.bz2 diff --git a/path-to-manpages-docbook-xsl.patch b/path-to-manpages-docbook-xsl.patch deleted file mode 100644 index bd86f4a..0000000 --- a/path-to-manpages-docbook-xsl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e34d60083a5eb5a918ac0a03c76062348f4292f1 Mon Sep 17 00:00:00 2001 -From: Federico Bruni -Date: Tue, 2 Oct 2018 05:56:15 +0200 -Subject: [PATCH] use Fedora path to manpages/docbook.xsl - -otherwise man and help pages won't be built. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 370ba78e..ace03de0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -553,7 +553,7 @@ AC_DEFINE_UNQUOTED(VIK_CONFIG_DEFAULT_TILE_AGE, ${VIK_CONFIG_DEFAULT_TILE_AGE}, - AC_DEFINE(HAVE_VIKING, 1, [Enable Viking specifics in otherwise reusable code]) - - dnl man pages processing --DB2MAN_XSL=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -+DB2MAN_XSL=/usr/share/sgml/docbook/xsl-stylesheets-1.79.2/manpages/docbook.xsl - AC_SUBST(DB2MAN_XSL) - AC_PATH_PROG(XP,xsltproc) - AM_CONDITIONAL([HAVE_XSLTPROC],[test "x$XP" != "x"]) --- -2.17.1 - diff --git a/viking.spec b/viking.spec index 40fddbb..69e35a9 100644 --- a/viking.spec +++ b/viking.spec @@ -4,12 +4,11 @@ Release: %autorelease Summary: GPS data editor and analyzer License: GPL-2.0-or-later -URL: http://viking.sourceforge.net/ -Source0: http://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2 -#Patch0: path-to-manpages-docbook-xsl.patch -ExcludeArch: s390 s390x +URL: https://viking.sourceforge.net/ +Source0: https://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2 +ExcludeArch: s390x -BuildRequires: make +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: expat-devel @@ -42,7 +41,10 @@ Requires: gpsbabel Requires: expect %description -Viking is a free/open source program to manage GPS data. You can import, plot and create tracks, routes and waypoints, show OSM, Bing Aerial and other maps, geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. +Viking is a free/open source program to manage GPS data. You can import, plot +and create tracks, routes and waypoints, show OSM, Bing Aerial and other maps, +geotag images, create routes using OSRM, see real-time GPS position, make maps +using Mapnik, control items, etc. %prep %autosetup @@ -60,10 +62,10 @@ done %install %make_install find %{buildroot} -name '*.a' -exec rm -f {} ';' -desktop-file-install \ - --add-category="GTK;Network;" \ - --delete-original \ - --dir=%{buildroot}%{_datadir}/applications \ +desktop-file-install \ + --add-category="GTK;Network;" \ + --delete-original \ + --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}/%{_datadir}/applications/%{name}.desktop %find_lang %{name} --with-gnome From 58779f73bbc2065fca993d2d216f7fbf05e25334 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 24 Sep 2024 23:19:41 +0300 Subject: [PATCH 17/31] Fix build failure due to Mapnik 4 incompatibility - Fixes rhbz#2301350 - Fixes rhbz#2296179 Upstream `master` branch has a commit for Mapnik 4 compatibility. Import it. Since it touches `configure.ac`, need to run autotools again. For that, add upstream's `autogen.sh` as new source and run it in prep. For that to work, full `yelp-tools` are needed, so build require them instead of just `itstool`. --- .gitignore | 2 ++ sources | 2 ++ viking.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 587ef6b..97106ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /viking-*.tar.bz2 +/autogen.sh +/443fe78cb097ae2196517fc726595b57cb9418c4.patch \ No newline at end of file diff --git a/sources b/sources index acac92e..2c8b87a 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (viking-1.10.tar.bz2) = d04877306fb3a4e6902297d8971ca72d30418727f110b8b9bc937b2738b95975a7f41a4c969cc19cf403e73339476ff46d7ccbae77e03c5b1cf5bcac891485e5 +SHA512 (autogen.sh) = 66f4f4ffbc7dc2343918c7fb0d58e3d503d811d71b655f435b3d5bdf6ac5fbe304a349ddc5370a53c2fb5bc4142707e7eab160c35038ca82aadc13294eb02ea0 +SHA512 (443fe78cb097ae2196517fc726595b57cb9418c4.patch) = 0101392cdeaa52d03ac092a83968ab59380e65671bc2988d97ba148e7e89c566f3aa520320b5410a4aec943b4c0cd15fb092be30a05e7bd1c8b6a01032f3ef0d diff --git a/viking.spec b/viking.spec index 69e35a9..552114e 100644 --- a/viking.spec +++ b/viking.spec @@ -6,7 +6,10 @@ Summary: GPS data editor and analyzer License: GPL-2.0-or-later URL: https://viking.sourceforge.net/ Source0: https://downloads.sourceforge.net/viking/viking-%{version}.tar.bz2 -ExcludeArch: s390x +# 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 BuildRequires: make BuildRequires: gcc-c++ @@ -34,7 +37,7 @@ BuildRequires: libzip-devel BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: json-glib-devel -BuildRequires: itstool +BuildRequires: yelp-tools Requires: hicolor-icon-theme Requires: gpsbabel @@ -47,7 +50,8 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep -%autosetup +%autosetup -p1 +cp %{SOURCE1} . && chmod +x autogen.sh # Convert to utf-8 for file in ChangeLog NEWS TODO; do mv $file timestamp @@ -56,6 +60,7 @@ for file in ChangeLog NEWS TODO; do done %build +NOCONFIGURE=1 ./autogen.sh %configure %make_build CFLAGS="${RPM_OPT_FLAGS} -fcommon" From 6a76993c5bdf362d891aab02cb9adaa4d0c1c08d Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 24 Sep 2024 23:24:52 +0300 Subject: [PATCH 18/31] Do not build on i686 architecture This package is not needed for multilib, thus i686 build would not bring any benefit. --- viking.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/viking.spec b/viking.spec index 552114e..02009d2 100644 --- a/viking.spec +++ b/viking.spec @@ -10,6 +10,8 @@ Source0: https://downloads.sourceforge.net/viking/viking-%{version}.tar.b # 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: make BuildRequires: gcc-c++ From 1e32195cbd2252a532041239e0513889b410ec85 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Tue, 15 Oct 2024 23:09:57 +0300 Subject: [PATCH 19/31] Run autogen.sh in %prep This is the correct phase for autogen.sh, which is usually run by upstream and result is directly included in release tarball. Also, added explicit dependency on autoconf. --- viking.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/viking.spec b/viking.spec index 02009d2..224ee61 100644 --- a/viking.spec +++ b/viking.spec @@ -13,6 +13,7 @@ Patch: https://github.com/viking-gps/viking/commit/443fe78cb097ae219651 # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86} +BuildRequires: autoconf BuildRequires: make BuildRequires: gcc-c++ BuildRequires: intltool @@ -54,6 +55,7 @@ using Mapnik, control items, etc. %prep %autosetup -p1 cp %{SOURCE1} . && chmod +x autogen.sh +NOCONFIGURE=1 ./autogen.sh # Convert to utf-8 for file in ChangeLog NEWS TODO; do mv $file timestamp @@ -62,7 +64,6 @@ for file in ChangeLog NEWS TODO; do done %build -NOCONFIGURE=1 ./autogen.sh %configure %make_build CFLAGS="${RPM_OPT_FLAGS} -fcommon" From 9cfe78d341ac895f632ef7689ac2af9a77b90592 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:19:50 +0000 Subject: [PATCH 20/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 906f7664661a4e619043c73c4c391833236d8278 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Wed, 29 Jan 2025 01:37:41 +0200 Subject: [PATCH 21/31] Make compatible with C23 (rhbz#2341507) --- ...re-vik_aggregate_layer_new-parameter.patch | 48 +++++++++++++++++++ viking.spec | 3 ++ 2 files changed, 51 insertions(+) create mode 100644 0000-Declare-vik_aggregate_layer_new-parameter.patch diff --git a/0000-Declare-vik_aggregate_layer_new-parameter.patch b/0000-Declare-vik_aggregate_layer_new-parameter.patch new file mode 100644 index 0000000..42c8856 --- /dev/null +++ b/0000-Declare-vik_aggregate_layer_new-parameter.patch @@ -0,0 +1,48 @@ +From 00af919af53652b2bc0fba5361e6be68b185f58d Mon Sep 17 00:00:00 2001 +From: Otto Liljalaakso +Date: Wed, 29 Jan 2025 00:55:18 +0200 +Subject: [PATCH] Declare vik_aggregate_layer_new parameter + + +diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h +index ffe71320..500fe29b 100644 +--- a/src/vikaggregatelayer.h ++++ b/src/vikaggregatelayer.h +@@ -45,7 +45,7 @@ GType vik_aggregate_layer_get_type (); + typedef struct _VikAggregateLayer VikAggregateLayer; + + void vik_aggregate_layer_uninit (); +-VikAggregateLayer *vik_aggregate_layer_new (); ++VikAggregateLayer *vik_aggregate_layer_new ( VikViewport *vvp ); + void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering ); + void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_layer ); + void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up ); +diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c +index 2ec210a4..e4382fdf 100644 +--- a/src/viklayerspanel.c ++++ b/src/viklayerspanel.c +@@ -537,7 +537,7 @@ static void vik_layers_panel_init ( VikLayersPanel *vlp ) + vlp->hbox = gtk_hbox_new ( TRUE, 2 ); + vlp->vt = vik_treeview_new ( ); + +- vlp->toplayer = vik_aggregate_layer_new (); ++ vlp->toplayer = vik_aggregate_layer_new ( NULL ); + vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer")); + g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(layers_panel_emit_update), vlp ); + +diff --git a/test/vik2vik.c b/test/vik2vik.c +index 8e2a0acb..ebc5bcb8 100644 +--- a/test/vik2vik.c ++++ b/test/vik2vik.c +@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) + // Also get lots of warnings about no actual drawing GCs available + // but for file processing this seems to be good enough + VikLoadType_t lt; +- VikAggregateLayer* agg = vik_aggregate_layer_new (); ++ VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL ); + VikViewport* vp = vik_viewport_new (); + + lt = a_file_load_stream ( stdin, NULL, agg, vp, NULL, TRUE, FALSE, NULL, "NotUsedName" ); +-- +2.48.1 + diff --git a/viking.spec b/viking.spec index 224ee61..d410465 100644 --- a/viking.spec +++ b/viking.spec @@ -10,6 +10,9 @@ Source0: https://downloads.sourceforge.net/viking/viking-%{version}.tar.b # 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 +# Make compatible with C23 +# Backported from https://github.com/viking-gps/viking/pull/316 +Patch: 0000-Declare-vik_aggregate_layer_new-parameter.patch # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86} From 3944f9c187b932b2139997bf017c8931716e5e7a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 27 May 2025 16:16:27 +0200 Subject: [PATCH 22/31] rebuild for new gpsd From 1d5f81ac98aeb08946ab8af2e2fc58008df506d1 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Mon, 9 Jun 2025 21:46:52 +0300 Subject: [PATCH 23/31] Rebuild for Mapnik 4.1 (rhbz#2370934) From e353afe78d538b1764c70c5365fc0c4ea602fc5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:04:59 +0000 Subject: [PATCH 24/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From b10d5c434ed95a0057a1307d7b65af6b30fa0c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Tue, 13 Jan 2026 14:02:15 +0100 Subject: [PATCH 25/31] Upgrade to version 1.11 --- .gitignore | 3 +-- sources | 4 +--- viking.spec | 34 ++++++++++++++++------------------ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 97106ca..37fba08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ -/viking-*.tar.bz2 /autogen.sh -/443fe78cb097ae2196517fc726595b57cb9418c4.patch \ No newline at end of file +/viking-1.11.tar.gz diff --git a/sources b/sources index 2c8b87a..eba5ee7 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (viking-1.10.tar.bz2) = d04877306fb3a4e6902297d8971ca72d30418727f110b8b9bc937b2738b95975a7f41a4c969cc19cf403e73339476ff46d7ccbae77e03c5b1cf5bcac891485e5 -SHA512 (autogen.sh) = 66f4f4ffbc7dc2343918c7fb0d58e3d503d811d71b655f435b3d5bdf6ac5fbe304a349ddc5370a53c2fb5bc4142707e7eab160c35038ca82aadc13294eb02ea0 -SHA512 (443fe78cb097ae2196517fc726595b57cb9418c4.patch) = 0101392cdeaa52d03ac092a83968ab59380e65671bc2988d97ba148e7e89c566f3aa520320b5410a4aec943b4c0cd15fb092be30a05e7bd1c8b6a01032f3ef0d +SHA512 (viking-1.11.tar.gz) = 8a1074a3729d41326021dec9873652be5eab89c231e6f58c30c11f690a30b69bd513a64d3311a6dd4845cfeb20ce6774d20376e2a1ebce2500475bf0cb435edc diff --git a/viking.spec b/viking.spec index d410465..c54889f 100644 --- a/viking.spec +++ b/viking.spec @@ -1,18 +1,17 @@ Name: viking -Version: 1.10 + +%global forgeurl https://github.com/viking-gps/viking +%global version0 1.11 +%forgemeta +Version: %forgeversion Release: %autorelease Summary: GPS data editor and analyzer License: GPL-2.0-or-later -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 -# Make compatible with C23 -# Backported from https://github.com/viking-gps/viking/pull/316 -Patch: 0000-Declare-vik_aggregate_layer_new-parameter.patch +URL: %forgeurl + +Source0: %forgesource + # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86} @@ -44,6 +43,8 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: json-glib-devel BuildRequires: yelp-tools +BuildRequires: xxd +BuildRequires: libnova-devel Requires: hicolor-icon-theme Requires: gpsbabel @@ -56,15 +57,12 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep -%autosetup -p1 -cp %{SOURCE1} . && chmod +x autogen.sh +%autosetup -p1 -n %name-%name-%version NOCONFIGURE=1 ./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 +# Convert TODO to utf-8 +mv TODO timestamp +iconv -f ISO-8859-1 -t UTF-8 -o TODO timestamp +touch -r timestamp TODO %build %configure From 45d86ce6b8b7bfd51cc68387b1c1f0868680dc44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Tue, 13 Jan 2026 21:02:22 +0100 Subject: [PATCH 26/31] Corrected %forgemeta configuration --- .gitignore | 1 + ...re-vik_aggregate_layer_new-parameter.patch | 48 ------------------- sources | 2 +- viking.spec | 3 +- 4 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 0000-Declare-vik_aggregate_layer_new-parameter.patch diff --git a/.gitignore b/.gitignore index 37fba08..aac45b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /autogen.sh /viking-1.11.tar.gz +/viking-viking-1.11.tar.gz diff --git a/0000-Declare-vik_aggregate_layer_new-parameter.patch b/0000-Declare-vik_aggregate_layer_new-parameter.patch deleted file mode 100644 index 42c8856..0000000 --- a/0000-Declare-vik_aggregate_layer_new-parameter.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 00af919af53652b2bc0fba5361e6be68b185f58d Mon Sep 17 00:00:00 2001 -From: Otto Liljalaakso -Date: Wed, 29 Jan 2025 00:55:18 +0200 -Subject: [PATCH] Declare vik_aggregate_layer_new parameter - - -diff --git a/src/vikaggregatelayer.h b/src/vikaggregatelayer.h -index ffe71320..500fe29b 100644 ---- a/src/vikaggregatelayer.h -+++ b/src/vikaggregatelayer.h -@@ -45,7 +45,7 @@ GType vik_aggregate_layer_get_type (); - typedef struct _VikAggregateLayer VikAggregateLayer; - - void vik_aggregate_layer_uninit (); --VikAggregateLayer *vik_aggregate_layer_new (); -+VikAggregateLayer *vik_aggregate_layer_new ( VikViewport *vvp ); - void vik_aggregate_layer_add_layer ( VikAggregateLayer *val, VikLayer *l, gboolean allow_reordering ); - void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_layer ); - void vik_aggregate_layer_move_layer ( VikAggregateLayer *val, GtkTreeIter *child_iter, gboolean up ); -diff --git a/src/viklayerspanel.c b/src/viklayerspanel.c -index 2ec210a4..e4382fdf 100644 ---- a/src/viklayerspanel.c -+++ b/src/viklayerspanel.c -@@ -537,7 +537,7 @@ static void vik_layers_panel_init ( VikLayersPanel *vlp ) - vlp->hbox = gtk_hbox_new ( TRUE, 2 ); - vlp->vt = vik_treeview_new ( ); - -- vlp->toplayer = vik_aggregate_layer_new (); -+ vlp->toplayer = vik_aggregate_layer_new ( NULL ); - vik_layer_rename ( VIK_LAYER(vlp->toplayer), _("Top Layer")); - g_signal_connect_swapped ( G_OBJECT(vlp->toplayer), "update", G_CALLBACK(layers_panel_emit_update), vlp ); - -diff --git a/test/vik2vik.c b/test/vik2vik.c -index 8e2a0acb..ebc5bcb8 100644 ---- a/test/vik2vik.c -+++ b/test/vik2vik.c -@@ -39,7 +39,7 @@ int main(int argc, char *argv[]) - // Also get lots of warnings about no actual drawing GCs available - // but for file processing this seems to be good enough - VikLoadType_t lt; -- VikAggregateLayer* agg = vik_aggregate_layer_new (); -+ VikAggregateLayer* agg = vik_aggregate_layer_new ( NULL ); - VikViewport* vp = vik_viewport_new (); - - lt = a_file_load_stream ( stdin, NULL, agg, vp, NULL, TRUE, FALSE, NULL, "NotUsedName" ); --- -2.48.1 - diff --git a/sources b/sources index eba5ee7..9603403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viking-1.11.tar.gz) = 8a1074a3729d41326021dec9873652be5eab89c231e6f58c30c11f690a30b69bd513a64d3311a6dd4845cfeb20ce6774d20376e2a1ebce2500475bf0cb435edc +SHA512 (viking-viking-1.11.tar.gz) = 8a1074a3729d41326021dec9873652be5eab89c231e6f58c30c11f690a30b69bd513a64d3311a6dd4845cfeb20ce6774d20376e2a1ebce2500475bf0cb435edc diff --git a/viking.spec b/viking.spec index c54889f..874fe61 100644 --- a/viking.spec +++ b/viking.spec @@ -2,6 +2,7 @@ Name: viking %global forgeurl https://github.com/viking-gps/viking %global version0 1.11 +%global tag0 viking-%version0 %forgemeta Version: %forgeversion Release: %autorelease @@ -57,7 +58,7 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep -%autosetup -p1 -n %name-%name-%version +%forgeautosetup NOCONFIGURE=1 ./autogen.sh # Convert TODO to utf-8 mv TODO timestamp From 31988f473c8bed726e57c135c98d43b41790d311 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 14 Jan 2026 11:49:43 +0100 Subject: [PATCH 27/31] Rebuild for new gpsd From 3b973c3949521d348175c969173d8c13765dc5c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:54:18 +0000 Subject: [PATCH 28/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 4b9b0978d69cb01d777a2a054a17683cf8a31187 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:28:54 +0000 Subject: [PATCH 29/31] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From ea40f6d149fef4e80375adc0af0f523ed1e2605b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Sat, 25 Jul 2026 11:14:22 +0200 Subject: [PATCH 30/31] Patch to build on F45 (rhbz#2505114) --- nettle-4.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++ viking.spec | 7 +++++-- 2 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 nettle-4.patch diff --git a/nettle-4.patch b/nettle-4.patch new file mode 100644 index 0000000..3eeea81 --- /dev/null +++ b/nettle-4.patch @@ -0,0 +1,46 @@ +diff --git a/configure.ac b/configure.ac +index 8f665e36..abed70da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -512,7 +512,7 @@ AC_CACHE_CHECK([whether to enable MD5 Hash support], + [ac_cv_enable_nettle], [ac_cv_enable_nettle=yes]) + case $ac_cv_enable_nettle in + yes) +- AC_CHECK_HEADER([nettle/md5-compat.h],[],[AC_MSG_ERROR([nettle/md5-compat.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])]) ++ AC_CHECK_HEADER([nettle/md5.h],[],[AC_MSG_ERROR([nettle/md5.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])]) + AC_CHECK_LIB([nettle], [main], [], + if test "$ac_mingw32" = "yes"; then + [LIBS="-lnettle $LIBS" +diff --git a/src/md5_hash.c b/src/md5_hash.c +index eaec8355..6508c636 100644 +--- a/src/md5_hash.c ++++ b/src/md5_hash.c +@@ -26,7 +26,8 @@ + #include "config.h" + #endif + #ifdef HAVE_LIBNETTLE +-#include ++#include ++#include + #endif + + /** +@@ -37,10 +38,14 @@ char *md5_hash(const char *message) + char *answer = NULL; + #ifdef HAVE_LIBNETTLE + unsigned char result[16]; +- MD5_CTX ctx; +- MD5Init ( &ctx ); +- MD5Update ( &ctx, (const unsigned char*)message, strlen(message) ); +- MD5Final ( &result[0], &ctx ); ++ struct md5_ctx ctx; ++ md5_init ( &ctx ); ++ md5_update ( &ctx, strlen(message), (const unsigned char*)message ); ++#if defined(NETTLE_VERSION_MAJOR) && NETTLE_VERSION_MAJOR >= 4 ++ md5_digest ( &ctx, &result[0] ); ++#else ++ md5_digest ( &ctx, MD5_DIGEST_SIZE, &result[0] ); ++#endif + /* + g_printf ( "%s: of string '%s' is: ", __FUNCTION__, message ); + for(int i = 0; i < 16; i++) diff --git a/viking.spec b/viking.spec index 874fe61..ded65f1 100644 --- a/viking.spec +++ b/viking.spec @@ -12,6 +12,9 @@ License: GPL-2.0-or-later URL: %forgeurl Source0: %forgesource +# https://github.com/viking-gps/viking/issues/387 +# https://github.com/viking-gps/viking/pull/388 +Patch0: nettle-4.patch # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86} @@ -30,7 +33,7 @@ BuildRequires: gnome-doc-utils BuildRequires: libexif-devel BuildRequires: bzip2-devel BuildRequires: file-devel -BuildRequires: libgexiv2-devel +BuildRequires: libgexiv2_0.14-devel BuildRequires: sqlite-devel BuildRequires: docbook-utils BuildRequires: docbook-style-xsl @@ -58,7 +61,7 @@ geotag images, create routes using OSRM, see real-time GPS position, make maps using Mapnik, control items, etc. %prep -%forgeautosetup +%forgeautosetup -p 1 NOCONFIGURE=1 ./autogen.sh # Convert TODO to utf-8 mv TODO timestamp From cf4e08bddfac7b8430d3eb2d96d136a5a1a1f1db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Uddeborg?= Date: Sat, 29 Aug 2026 15:09:02 +0200 Subject: [PATCH 31/31] Rebuild with newer mapnik rhbz#2521789 - Bump to snapshot version including upstreamed patch --- .gitignore | 1 + nettle-4.patch | 46 ---------------------------------------------- sources | 2 +- viking.spec | 5 +---- 4 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 nettle-4.patch diff --git a/.gitignore b/.gitignore index aac45b2..d78360d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /autogen.sh /viking-1.11.tar.gz /viking-viking-1.11.tar.gz +/viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz diff --git a/nettle-4.patch b/nettle-4.patch deleted file mode 100644 index 3eeea81..0000000 --- a/nettle-4.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 8f665e36..abed70da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -512,7 +512,7 @@ AC_CACHE_CHECK([whether to enable MD5 Hash support], - [ac_cv_enable_nettle], [ac_cv_enable_nettle=yes]) - case $ac_cv_enable_nettle in - yes) -- AC_CHECK_HEADER([nettle/md5-compat.h],[],[AC_MSG_ERROR([nettle/md5-compat.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])]) -+ AC_CHECK_HEADER([nettle/md5.h],[],[AC_MSG_ERROR([nettle/md5.h is needed but not found - you will need to install package 'nettle-dev' or similar. The feature can be disabled with --disable-nettle])]) - AC_CHECK_LIB([nettle], [main], [], - if test "$ac_mingw32" = "yes"; then - [LIBS="-lnettle $LIBS" -diff --git a/src/md5_hash.c b/src/md5_hash.c -index eaec8355..6508c636 100644 ---- a/src/md5_hash.c -+++ b/src/md5_hash.c -@@ -26,7 +26,8 @@ - #include "config.h" - #endif - #ifdef HAVE_LIBNETTLE --#include -+#include -+#include - #endif - - /** -@@ -37,10 +38,14 @@ char *md5_hash(const char *message) - char *answer = NULL; - #ifdef HAVE_LIBNETTLE - unsigned char result[16]; -- MD5_CTX ctx; -- MD5Init ( &ctx ); -- MD5Update ( &ctx, (const unsigned char*)message, strlen(message) ); -- MD5Final ( &result[0], &ctx ); -+ struct md5_ctx ctx; -+ md5_init ( &ctx ); -+ md5_update ( &ctx, strlen(message), (const unsigned char*)message ); -+#if defined(NETTLE_VERSION_MAJOR) && NETTLE_VERSION_MAJOR >= 4 -+ md5_digest ( &ctx, &result[0] ); -+#else -+ md5_digest ( &ctx, MD5_DIGEST_SIZE, &result[0] ); -+#endif - /* - g_printf ( "%s: of string '%s' is: ", __FUNCTION__, message ); - for(int i = 0; i < 16; i++) diff --git a/sources b/sources index 9603403..841d50b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viking-viking-1.11.tar.gz) = 8a1074a3729d41326021dec9873652be5eab89c231e6f58c30c11f690a30b69bd513a64d3311a6dd4845cfeb20ce6774d20376e2a1ebce2500475bf0cb435edc +SHA512 (viking-2a2420963e4b913d0b37dcf8801dc3695ca72a6c.tar.gz) = 94eb5f5f211ed4f1645a0b7b4d9ce3adeaffdf1502f3a9367bc99a37b9ad2e739337b7920766ac5b9719aca1ad95fab368b8343550420fda5cebbdcce5cdc795 diff --git a/viking.spec b/viking.spec index ded65f1..f5d0e5d 100644 --- a/viking.spec +++ b/viking.spec @@ -2,7 +2,7 @@ Name: viking %global forgeurl https://github.com/viking-gps/viking %global version0 1.11 -%global tag0 viking-%version0 +%global commit 2a2420963e4b913d0b37dcf8801dc3695ca72a6c %forgemeta Version: %forgeversion Release: %autorelease @@ -12,9 +12,6 @@ License: GPL-2.0-or-later URL: %forgeurl Source0: %forgesource -# https://github.com/viking-gps/viking/issues/387 -# https://github.com/viking-gps/viking/pull/388 -Patch0: nettle-4.patch # Fails to build on s390x, not needed for multilib ExcludeArch: s390x %{ix86}