From 054a3b9eb7336186e6f3e537bfd065ca7120fd55 Mon Sep 17 00:00:00 2001 From: Michal Domonkos Date: Fri, 31 May 2024 13:33:10 +0200 Subject: [PATCH 1/5] Fix improperly commented out macros in %prep Since RPM 4.20, %prep is no longer implemented as a special "hack" [1] but is now a regular build scriptlet, meaning that %setup or %patch are now treated as regular macros and thus will be expanded even in comments (as documented in [2]). Our spec has these so fix them up to unbreak the build on F41. [1] https://github.com/rpm-software-management/rpm/issues/2205 [2] https://rpm-software-management.github.io/rpm/manual/spec.html --- dietlibc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dietlibc.spec b/dietlibc.spec index 7e246fd..06ca234 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -83,9 +83,9 @@ This package contains the dynamic libraries for dietlibc. %prep %setup -q %{?prerelease:-n %{name}-%{version}.%prerelease} -#%setup -qn dietlibc +%dnl %setup -qn dietlibc -#%apply -n0 -p1 +%dnl %apply -n0 -p1 %patch -P 1 -p0 %patch -P 2 -p1 From e396f8ce414519a2f062c70bdd82132da341b7c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 20:58:15 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- dietlibc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dietlibc.spec b/dietlibc.spec index 06ca234..4c9d37f 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -27,7 +27,7 @@ Summary: Small libc implementation Name: dietlibc Version: 0.34 -Release: 17%{?dist} +Release: 18%{?dist} License: GPL-2.0-only URL: http://www.fefe.de/dietlibc/ %if !0%{?prerelease:1} @@ -158,6 +158,9 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512 %pkglibdir %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.34-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 0.34-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From caa2e140a781548bd1a4497ebaecd18212aa63bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 15:45:00 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- dietlibc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dietlibc.spec b/dietlibc.spec index 4c9d37f..0821b32 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -27,7 +27,7 @@ Summary: Small libc implementation Name: dietlibc Version: 0.34 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL-2.0-only URL: http://www.fefe.de/dietlibc/ %if !0%{?prerelease:1} @@ -158,6 +158,9 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512 %pkglibdir %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.34-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 0.34-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d48a6a0274454b4e78505999d9dd6c3cfedce97f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 3 Feb 2025 11:35:11 -0600 Subject: [PATCH 4/5] Fix FTBFS --- dietlibc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dietlibc.spec b/dietlibc.spec index 0821b32..de5daa6 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -109,7 +109,7 @@ sed -i \ dietfeatures.h %endif -%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration -Wno-unused -Wno-switch +%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os -g3 -Werror-implicit-function-declaration -Wno-unused -Wno-switch -std=gnu17 %global basemakeflags prefix=%pkglibdir BINDIR=%{_bindir} MAN1DIR=%{_mandir}/man1 CFLAGS="$RPM_OPT_FLAGS %fixcflags $XTRA_CFLAGS" PDIET=%pkglibdir STRIP=: %global makeflags %basemakeflags From 30bc22cffeb998867faba7a476c9286f5b748e89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:16:41 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- dietlibc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dietlibc.spec b/dietlibc.spec index de5daa6..37aa2d9 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -27,7 +27,7 @@ Summary: Small libc implementation Name: dietlibc Version: 0.34 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL-2.0-only URL: http://www.fefe.de/dietlibc/ %if !0%{?prerelease:1} @@ -158,6 +158,9 @@ ulimit -m $[ 128*1024 ] -v $[ 256*1024 ] -d $[ 128*1024 ] -s 512 %pkglibdir %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.34-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.34-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild