[freeguide] Bump min java source to 7. Fixes FTBS

commit 5312732c6a369b1808acb0b4fb88495779c27044 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Mon Aug 7 12:14:44 2023 -0500 Bump min java source to 7. Fixes FTBS Update source url to new location Use autosetup macro freeguide.spec | 19 ++++++++++++------- sources | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) --- diff --git a/freeguide.spec b/freeguide.spec index a8fff0a..175b863 100644 --- a/freeguide.spec +++ b/freeguide.spec @@ -1,12 +1,12 @@ Name: freeguide Version: 0.11.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A TV Guide Group: Applications/Multimedia License: GPLv2 URL: http://www.artificialworlds.net/freeguide/Main/HomePage -Source0: http://downloads.sourceforge.net/freeguide-tv/freeguide-%{version}.tar.gz +Source0: https://codeberg.org/andybalaam/FreeGuide/archive/%{version}.tar.gz#/free... Source1: freeguide.desktop # completely disable the automatic check for updates Patch0: 0001-disable-check-for-updates.patch @@ -16,6 +16,7 @@ BuildRequires: java-devel >= 1:1.6.0 BuildRequires: javapackages-tools BuildRequires: ant BuildRequires: desktop-file-utils +BuildRequires: sed Requires: java >= 1:1.6.0 Requires: javapackages-tools @@ -31,19 +32,19 @@ favorites list. It works with listings for many countries. Check the web site freeguide-tv.sf.net for details. - %prep -%setup -q -%patch0 -p1 +%autosetup -n %{name} -p1 find . -name '*.jar' -exec rm -f '{}' \; rm -rf xmltv +# Java source option 5 is no longer supported, bump it higher +sed -i 's/1.5/1.7/g' build.xml + %build ant jar - %install ant -Dinstall_bin_dir=%{buildroot}/%{_bindir} \ -Dinstall_share_dir=%{buildroot}/%{_datadir} \ @@ -75,8 +76,12 @@ desktop-file-install \ %{_datadir}/applications/* %{_datadir}/pixmaps/* - %changelog +* Mon Aug 07 2023 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 0.11.1-11 +- Bump min java source to 7. Fixes FTBS +- Update source url to new location +- Use autosetup macro + * Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.11.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 45c1dc7..e00e6b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ee924fab9b81ea84456ce9800ed06a9c freeguide-0.11.1.tar.gz +SHA512 (freeguide-0.11.1.tar.gz) = 460c776fe223e2ad30758df12d32e3be070f3af6221693117f17973a85119923a9fbe24b04c1a612814e440504483b9d0cac77e400f2362447f222b6a6e9f734