diff --git a/gputils.spec b/gputils.spec index 3f2dd19..49e543d 100644 --- a/gputils.spec +++ b/gputils.spec @@ -1,18 +1,16 @@ Name: gputils Version: 1.5.2 -Release: 11%{?dist} +Release: 4%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Outils de développement pour les microcontrôleurs PIC (TM) de Microchip (TM) -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://gputils.sourceforge.net Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2 Patch1: gpasm_%{version}.patch -Patch2: libgputils-%{version}.patch Provides: bundled(libiberty) -BuildRequires: gcc +BuildRequires: gcc BuildRequires: autoconf flex bison BuildRequires: make @@ -36,8 +34,7 @@ This package containes gputils documentation and HTML documentation for supporte %prep %setup -q -%patch -P 1 -p0 -%patch -P 2 -p1 +%patch1 -p0 %build autoconf -f -i @@ -65,27 +62,6 @@ cp -f doc/%{name}.p* %{buildroot}/usr/share/doc/%{name}-doc/ %changelog -* Thu Jul 16 2026 Fedora Release Engineering - 1.5.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Jan 16 2026 Fedora Release Engineering - 1.5.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Thu Jul 24 2025 Fedora Release Engineering - 1.5.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jan 27 2025 Roy Rankin 1.5.2-8 -- patch to build with gcc C23 - -* Fri Jan 17 2025 Fedora Release Engineering - 1.5.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.5.2-6 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 1.5.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Wed Jan 24 2024 Fedora Release Engineering - 1.5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/libgputils-1.5.2.patch b/libgputils-1.5.2.patch deleted file mode 100644 index affea32..0000000 --- a/libgputils-1.5.2.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/libgputils/gpcoffgen.h b/libgputils/gpcoffgen.h -index 41d3f89..8ee08b9 100644 ---- a/libgputils/gpcoffgen.h -+++ b/libgputils/gpcoffgen.h -@@ -88,7 +88,7 @@ extern gp_reloc_t *gp_coffgen_add_reloc(gp_section_t *Section); - #define RELOC_DISABLE_WARN (1 << 0) - #define RELOC_ENABLE_CINIT_WARN (1 << 1) - --extern void gp_coffgen_check_relocations(const gp_object_t *Object, unsigned int Behavior); -+extern void gp_coffgen_check_relocations(const gp_object_t *Object, gp_boolean Behavior); - - extern gp_boolean gp_coffgen_del_reloc(gp_section_t *Section, gp_reloc_t *Relocation); - extern const char *gp_coffgen_reloc_type_to_str(uint16_t Type); -diff --git a/libgputils/gptypes.h b/libgputils/gptypes.h -index 95eb609..8356d8f 100644 ---- a/libgputils/gptypes.h -+++ b/libgputils/gptypes.h -@@ -26,10 +26,14 @@ Boston, MA 02111-1307, USA. */ - - #include "stdhdr.h" - --typedef enum { -- false = (0 == 1), -- true = (0 == 0) --} gp_boolean; -+#if defined __STDC_VERSION__ && __STDC_VERSION__ > 201710L -+// ISO C standard >= C23 -+#define gp_boolean bool -+#else -+#define gp_boolean _Bool -+#define true 1 -+#define false 0 -+#endif - - typedef long gp_symvalue_t; -