From b6ffe4db6c06d181492fecbd8a790eacb95ee6e5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Apr 02 2024 19:06:07 +0000 Subject: FCODE utils ver. 1.0.3 Signed-off-by: Peter Lemenkov --- diff --git a/.gitignore b/.gitignore index b23b2d2..19ddc9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ fcode-utils-1.0.2.zip /fcode-utils-1.0.2.tar.xz +/fcode-utils-1.0.3.tar.gz diff --git a/fcode-utils-0001-Allow-overriding-some-more-Makefile-variables.patch b/fcode-utils-0001-Allow-overriding-some-more-Makefile-variables.patch index c00befc..603dda2 100644 --- a/fcode-utils-0001-Allow-overriding-some-more-Makefile-variables.patch +++ b/fcode-utils-0001-Allow-overriding-some-more-Makefile-variables.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Allow overriding some more Makefile variables Signed-off-by: Peter Lemenkov diff --git a/detok/Makefile b/detok/Makefile -index 3ba6c30..0e422fb 100644 +index 235966a..4f64445 100644 --- a/detok/Makefile +++ b/detok/Makefile @@ -24,13 +24,13 @@ @@ -26,7 +26,7 @@ index 3ba6c30..0e422fb 100644 # Coverage: diff --git a/romheaders/Makefile b/romheaders/Makefile -index a216e7b..1831036 100644 +index cdb3d51..c1e873f 100644 --- a/romheaders/Makefile +++ b/romheaders/Makefile @@ -24,10 +24,10 @@ @@ -44,7 +44,7 @@ index a216e7b..1831036 100644 SOURCES = romheaders.c ../shared/classcodes.c diff --git a/toke/Makefile b/toke/Makefile -index aa75acd..8e31abd 100644 +index 0b9c928..3306549 100644 --- a/toke/Makefile +++ b/toke/Makefile @@ -24,13 +24,13 @@ diff --git a/fcode-utils-0002-toke-Makefile-Declare-return-type-of-main-in-GCC-fla.patch b/fcode-utils-0002-toke-Makefile-Declare-return-type-of-main-in-GCC-fla.patch index 925df7f..85db724 100644 --- a/fcode-utils-0002-toke-Makefile-Declare-return-type-of-main-in-GCC-fla.patch +++ b/fcode-utils-0002-toke-Makefile-Declare-return-type-of-main-in-GCC-fla.patch @@ -1,12 +1,12 @@ -toke/Makefile: Declare return type of main in GCC flag probe +From: Florian Weimer +Date: Tue, 7 Feb 2023 12:47:13 +0100 +Subject: [PATCH] toke/Makefile: Declare return type of main in GCC flag probe Without it, the probe may incorrectly fail with future compilers which do not support implicit ints. -Submitted upstream: - diff --git a/toke/Makefile b/toke/Makefile -index 8e31abd24d722882..cb3bb8d573f2f1f0 100644 +index 3306549..783c70c 100644 --- a/toke/Makefile +++ b/toke/Makefile @@ -41,7 +41,7 @@ LDFLAGS = diff --git a/fcode-utils.spec b/fcode-utils.spec index 73ca17c..f8a5571 100644 --- a/fcode-utils.spec +++ b/fcode-utils.spec @@ -1,20 +1,19 @@ Name: fcode-utils -Version: 1.0.2 +Version: 1.0.3 Release: %autorelease Summary: Utilities for dealing with FCode -# The entire source code is GPLv2 except localvalues/ and documentation/ which are CPL-licensed -License: GPLv2 and CPL +# The entire source code is GPL-2.0-only except localvalues/ and documentation/ which are CPL-1.0 licensed +License: GPL-2.0-only AND CPL-1.0 URL: http://www.openfirmware.info/FCODE_suite -## svn co http://code.coreboot.org/svn/openbios/trunk/fcode-utils-devel@1354 fcode-utils-1.0.2 -## tar --exclude-vcs -cvJf fcode-utils-1.0.2.tar.xz fcode-utils-1.0.2/ -Source0: %{name}-%{version}.tar.xz +Source0: https://github.com/openbios/fcode-utils/archive/v%{version}/%{name}-%{version}.tar.gz # Fedora-specific patch Patch1: fcode-utils-0001-Allow-overriding-some-more-Makefile-variables.patch -Patch2: fcode-utils-c99.patch +# Submitted upstream: https://github.com/openbios/fcode-utils/pull/14 +Patch2: fcode-utils-0002-toke-Makefile-Declare-return-type-of-main-in-GCC-fla.patch # For tests only -BuildRequires: gcc +BuildRequires: make BuildRequires: tcsh -BuildRequires: make +BuildRequires: gcc %description @@ -23,9 +22,7 @@ compliant with ANS Forth. %prep -%setup -q -%patch1 -p1 -b .more_overrides -%patch2 -p1 +%autosetup -p1 install -p -m 0644 detok/README README.detok install -p -m 0644 toke/README README.toke diff --git a/sources b/sources index 9950fd6..4519da2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49ccf857901be8377502e1037f244d00 fcode-utils-1.0.2.tar.xz +SHA512 (fcode-utils-1.0.3.tar.gz) = 7f64d3ac5c10184efc0993a748a5dcbf9aa0b71dee059c9b97b3656e61cdd7ed9395e830435eab5878ece80df001cf9420065b1611e8bb011274e26aad20f3f0