diff --git a/.gitignore b/.gitignore index 9219618..9890142 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,3 @@ gputils-0.13.7.tar.gz /gputils-1.2.0.tar.gz /gputils-1.3.0.tar.gz /gputils-1.4.2-1.tar.gz -/gputils-1.5.0-1.tar.bz2 -/gputils-1.5.2.tar.bz2 diff --git a/gpasm_1.5.2.patch b/gpasm_1.5.2.patch deleted file mode 100644 index 1963b5e..0000000 --- a/gpasm_1.5.2.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: gpasm/directive.c -=================================================================== ---- gpasm/directive.c (revision 1330) -+++ gpasm/directive.c (working copy) -@@ -128,6 +128,19 @@ - --Max_size; - break; - -+ // special characters -+ case '0': //(NULL) -+ case 'a': //(bell) -+ case 'b': //(backspace) -+ case 't': //(tab) -+ case 'n': //(newline) -+ case 'v': //(vertical tab) -+ case 'f': //(form feed) -+ case 'r': //(return) -+ *d++ = '\\'; -+ *d++ = ch; -+ break; -+ - default: { - *d++ = ch; - --Max_size; diff --git a/gputils.spec b/gputils.spec index 3f2dd19..7269feb 100644 --- a/gputils.spec +++ b/gputils.spec @@ -1,20 +1,17 @@ Name: gputils -Version: 1.5.2 -Release: 11%{?dist} +Version: 1.4.2 +Release: 3%{?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 +Group: Development/Languages +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 +Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-1.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Provides: bundled(libiberty) -BuildRequires: gcc BuildRequires: autoconf flex bison -BuildRequires: make %description This is a collection of development tools for Microchip (TM) PIC (TM) @@ -36,12 +33,10 @@ This package containes gputils documentation and HTML documentation for supporte %prep %setup -q -%patch -P 1 -p0 -%patch -P 2 -p1 %build autoconf -f -i -%configure --enable-gdb-debuginfo +%configure %{__make} %{?_smp_mflags} %install @@ -52,6 +47,9 @@ mv -f %{buildroot}/usr/share/doc/%{name}-%{version}/html %{buildroot}/usr/share/ cp -f doc/%{name}.p* %{buildroot}/usr/share/doc/%{name}-doc/ +%clean +%{__rm} -rf $RPM_BUILD_ROOT + %files %doc AUTHORS ChangeLog COPYING README TODO %{_bindir}/* @@ -65,81 +63,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 - -* Sat Jan 20 2024 Fedora Release Engineering - 1.5.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.5.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.5.2-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Jan 01 2023 Roy Rankin 1.5.2-0 -- Upstream release - -* Thu Jul 21 2022 Fedora Release Engineering - 1.5.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.5.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 1.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 10 2018 Roy Rankin 1.5.0-2 -- Patch for gplink assert on undefined symbol - -* Fri Jul 20 2018 Roy Rankin 1.5.0-1 -- Add patches to fix bugs found by gpsim - -* Mon Jul 16 2018 Roy Rankin 1.5.0-0 -- Upstream release, Add debug flag to configure - -* Fri Jul 13 2018 Fedora Release Engineering - 1.4.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Wed Aug 02 2017 Fedora Release Engineering - 1.4.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_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; - diff --git a/sources b/sources index dd898ca..dfcb6fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gputils-1.5.2.tar.bz2) = 43ed508d164152bf36e4f27b09656e6e3d58fc174806ad57d6415e6e2726a56381b1323be3acfc635f2a05babade695e9777b0db8b5f4b90da00b9d29e75eddc +e0d074b9d481b2419b0411938d046102 gputils-1.4.2-1.tar.gz