From cc8811bdf04bb58f7eb73af542640e525fadb08a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:37:08 +0000 Subject: [PATCH 01/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 10c8290..78d887e 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -49,6 +49,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.9-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a1b63342a124b3a4c0c45b974c525b648cee1814 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:33:45 +0000 Subject: [PATCH 02/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 78d887e..484af1f 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -49,6 +49,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.9-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.9-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 252b893511cf6b1b31ded9bae25785bd5479f3f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:22:32 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 484af1f..0e52e4f 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -49,6 +49,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.9-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.9-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dbd1e219b76c9cf56284d2fe9a6df51270f4cea6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:48:45 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 0e52e4f..1a8f63b 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -49,6 +49,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.9-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.9-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a96f4742317540c983288156a81a89d48d119600 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 17 Feb 2023 21:06:26 +0100 Subject: [PATCH 05/15] Port to C99 (#2170958) Related to: --- mactel-boot-c99.patch | 15 +++++++++++++++ mactel-boot.spec | 8 ++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 mactel-boot-c99.patch diff --git a/mactel-boot-c99.patch b/mactel-boot-c99.patch new file mode 100644 index 0000000..d3f18be --- /dev/null +++ b/mactel-boot-c99.patch @@ -0,0 +1,15 @@ +Include for the close function. This prevents a future +build failure due to an implicit function declaration. + +diff --git a/bless.c b/bless.c +index 4d107feff0c0ece4..60d426e897c37e4d 100644 +--- a/bless.c ++++ b/bless.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #define HFSPLUS_IOC_BLESS _IO('h', 0x80) + diff --git a/mactel-boot.spec b/mactel-boot.spec index 1a8f63b..52e6427 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,12 +1,13 @@ Name: mactel-boot Version: 0.9 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Intel Mac boot files License: GPLv2+ URL: http://www.codon.org.uk/~mjg59/mactel-boot/ Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 Source1: mactel-boot-setup +Patch0: mactel-boot-c99.patch ExclusiveArch: x86_64 @@ -18,7 +19,7 @@ BuildRequires: gcc Files for booting Fedora on Intel-based Apple hardware using EFI. %prep -%setup -q +%autosetup -p1 %build make PRODUCTVERSION="Fedora %{fedora}" %{?_smp_mflags} @@ -49,6 +50,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Fri Feb 17 2023 Florian Weimer - 0.9-29 +- Port to C99 (#2170958) + * Thu Jan 19 2023 Fedora Release Engineering - 0.9-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 87796edef1a6aef30bb23b889c4d3c7476e776bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:35:34 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 52e6427..28dbaad 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -50,6 +50,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Feb 17 2023 Florian Weimer - 0.9-29 - Port to C99 (#2170958) From 69f58c6f337c0e617cf6864147eb0d7a0efeaed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:45:20 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 28dbaad..7ed0f59 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -50,6 +50,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.9-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.9-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1ed7c4ef77aca0c117e0dc10da6c663f680fd6a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:36:29 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 7ed0f59..cdc6964 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -50,6 +50,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.9-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d478e7cdfe53cda67a96b709c30b66417894dac1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:34:33 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index cdc6964..d9ff57e 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Intel Mac boot files License: GPLv2+ @@ -50,6 +50,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.9-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.9-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c6adc844cf9315fdadd80f3f507ae4902b71410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 01:12:43 +0200 Subject: [PATCH 10/15] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- mactel-boot.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index d9ff57e..c46d5f4 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,9 +1,10 @@ Name: mactel-boot Version: 0.9 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Intel Mac boot files -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://www.codon.org.uk/~mjg59/mactel-boot/ Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 Source1: mactel-boot-setup @@ -50,6 +51,9 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup /usr/libexec/mactel-boot-setup %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.9-34 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 0.9-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From da1c3e396cfab2224d1fba24c17a46f4a87a9a0a Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 7 Jan 2025 12:17:49 -0600 Subject: [PATCH 11/15] Orphaned for 6+ weeks --- .gitignore | 1 - dead.package | 1 + mactel-boot-c99.patch | 15 ---- mactel-boot-setup | 38 ---------- mactel-boot.spec | 169 ------------------------------------------ sources | 1 - 6 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 mactel-boot-c99.patch delete mode 100644 mactel-boot-setup delete mode 100644 mactel-boot.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 51a495e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/mactel-boot-0.9.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/mactel-boot-c99.patch b/mactel-boot-c99.patch deleted file mode 100644 index d3f18be..0000000 --- a/mactel-boot-c99.patch +++ /dev/null @@ -1,15 +0,0 @@ -Include for the close function. This prevents a future -build failure due to an implicit function declaration. - -diff --git a/bless.c b/bless.c -index 4d107feff0c0ece4..60d426e897c37e4d 100644 ---- a/bless.c -+++ b/bless.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - - #define HFSPLUS_IOC_BLESS _IO('h', 0x80) - diff --git a/mactel-boot-setup b/mactel-boot-setup deleted file mode 100644 index ea61394..0000000 --- a/mactel-boot-setup +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -if [ x`df -T /boot/efi | tail -n +2 | awk '{print $2}'` != x"hfsplus" ]; then - exit -fi - -if [ -f /boot/efi/EFI/redhat/grub.efi ]; then - DIR=redhat - LOADER=grub.efi - CONFIG=grub.conf - TARGET=boot.conf -elif [ -f /boot/efi/EFI/redhat/grub2-efi/grub.efi ]; then - DIR=redhat/grub2-efi - LOADER=grub.efi - CONFIG=grub.cfg - TARGET=boot.cfg -elif [ -f /boot/efi/EFI/fedora/grubx64.efi ]; then - DIR=fedora - LOADER=grubx64.efi - CONFIG=grub.cfg - TARGET=boot.cfg -else - exit -fi - -SYSDIR=/boot/efi/System/Library/Coreservices -ln -f /boot/efi/EFI/$DIR/$LOADER $SYSDIR/boot.efi -ln -sf ../../../EFI/$DIR/$CONFIG $SYSDIR/$TARGET -hfs-bless /boot/efi/EFI/$DIR/$LOADER - -if [ -f /usr/share/pixmaps/bootloader/fedora.vol ]; then - cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/EFI/$DIR/.disk_label -fi - -if [ -f /usr/share/pixmaps/bootloader/fedora.icns ]; then - cp /usr/share/pixmaps/bootloader/fedora.icns /boot/efi/.VolumeIcon.icns; -fi; - diff --git a/mactel-boot.spec b/mactel-boot.spec deleted file mode 100644 index c46d5f4..0000000 --- a/mactel-boot.spec +++ /dev/null @@ -1,169 +0,0 @@ -Name: mactel-boot -Version: 0.9 -Release: 34%{?dist} -Summary: Intel Mac boot files - -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://www.codon.org.uk/~mjg59/mactel-boot/ -Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 -Source1: mactel-boot-setup -Patch0: mactel-boot-c99.patch - -ExclusiveArch: x86_64 - -Requires: coreutils - -BuildRequires: make -BuildRequires: gcc -%description -Files for booting Fedora on Intel-based Apple hardware using EFI. - -%prep -%autosetup -p1 - -%build -make PRODUCTVERSION="Fedora %{fedora}" %{?_smp_mflags} - -%install -make install DESTDIR=$RPM_BUILD_ROOT -install -D -m 644 SystemVersion.plist $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/SystemVersion.plist -echo "This file is required for booting" >$RPM_BUILD_ROOT/boot/efi/mach_kernel -touch $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/boot.efi -touch $RPM_BUILD_ROOT/boot/efi/.VolumeIcon.icns -install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup - -%files -%license GPL -%license Copyright -/usr/share/man/man1/hfs-bless.1.gz -/boot/efi/mach_kernel -%dir /boot/efi/System/ -%dir /boot/efi/System/Library/ -%dir /boot/efi/System/Library/CoreServices/ -/boot/efi/System/Library/CoreServices/SystemVersion.plist -/usr/sbin/hfs-bless -/usr/libexec/mactel-boot-setup -%attr(0755, root, root) %ghost /boot/efi/System/Library/CoreServices/boot.efi -%attr(0644, root, root) %ghost /boot/efi/.VolumeIcon.icns - -%triggerin -- grub-efi grub2-efi fedora-logos generic-logos -/usr/libexec/mactel-boot-setup - -%changelog -* Fri Jul 26 2024 Miroslav Suchý - 0.9-34 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 0.9-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.9-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.9-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0.9-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Fri Feb 17 2023 Florian Weimer - 0.9-29 -- Port to C99 (#2170958) - -* Thu Jan 19 2023 Fedora Release Engineering - 0.9-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 0.9-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.9-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.9-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.9-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0.9-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.9-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.9-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Mar 13 2019 Peter Robinson 0.9-20 -- Own all the directories, use %%license - -* Fri Feb 01 2019 Fedora Release Engineering - 0.9-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.9-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 0.9-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.9-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.9-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sun Aug 17 2014 Fedora Release Engineering - 0.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Sep 06 2012 Matthew Garrett - 0.9-7 -- update mactel-boot-setup for F18 - -* Mon May 14 2012 Matthew Garrett - 0.9-6 -- Fix destination path for disk label install - -* Wed Apr 25 2012 Matthew Garrett - 0.9-5 -- Move trigger functionality into an external script - -* Thu Apr 19 2012 Matthew Garrett - 0.9-4 -- Blessing must take place after linking - -* Thu Apr 19 2012 Matthew Garrett - 0.9-3 -- Hardlink the bootloader to boot.efi, rather than symlinking -- Redo the spec file to make better use of macros - -* Tue Feb 28 2012 Matthew Garrett - 0.9-2 -- add support for volume labels - -* Tue Feb 07 2012 Matthew Garrett - 0.9-1 -- new upstream, uses kernel ioctl rather than editing the fs by hand - -* Wed Dec 14 2011 Matthew Garrett - 0.1-4 -- Fix symlinks - -* Tue Dec 13 2011 Matthew Garrett - 0.1-3 -- rename binary to hfs-bless -- make sure writes actually hit disk - -* Mon Nov 21 2011 Matthew Garrett - 0.1-2 -- switch to using triggers -- ensure that the filesystem is HFS+ before running bless - -* Fri Nov 18 2011 Matthew Garrett - 0.1-1 -- initial release diff --git a/sources b/sources deleted file mode 100644 index 9993184..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -9933eabcb6305292e76a2542043e421a mactel-boot-0.9.tar.bz2 From 3d5ed19498495d6fd88bdf01b4b7506b21a89a1c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Mar 2025 16:28:59 +0000 Subject: [PATCH 12/15] Unretirement request: pagure.io/releng/issue/12642 Revert "Orphaned for 6+ weeks" This reverts commit da1c3e396cfab2224d1fba24c17a46f4a87a9a0a. Signed-off-by: Fedora Release Engineering --- .gitignore | 1 + dead.package | 1 - mactel-boot-c99.patch | 15 ++++ mactel-boot-setup | 38 ++++++++++ mactel-boot.spec | 169 ++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 6 files changed, 224 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 mactel-boot-c99.patch create mode 100644 mactel-boot-setup create mode 100644 mactel-boot.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..51a495e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/mactel-boot-0.9.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/mactel-boot-c99.patch b/mactel-boot-c99.patch new file mode 100644 index 0000000..d3f18be --- /dev/null +++ b/mactel-boot-c99.patch @@ -0,0 +1,15 @@ +Include for the close function. This prevents a future +build failure due to an implicit function declaration. + +diff --git a/bless.c b/bless.c +index 4d107feff0c0ece4..60d426e897c37e4d 100644 +--- a/bless.c ++++ b/bless.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #define HFSPLUS_IOC_BLESS _IO('h', 0x80) + diff --git a/mactel-boot-setup b/mactel-boot-setup new file mode 100644 index 0000000..ea61394 --- /dev/null +++ b/mactel-boot-setup @@ -0,0 +1,38 @@ +#!/bin/bash + +if [ x`df -T /boot/efi | tail -n +2 | awk '{print $2}'` != x"hfsplus" ]; then + exit +fi + +if [ -f /boot/efi/EFI/redhat/grub.efi ]; then + DIR=redhat + LOADER=grub.efi + CONFIG=grub.conf + TARGET=boot.conf +elif [ -f /boot/efi/EFI/redhat/grub2-efi/grub.efi ]; then + DIR=redhat/grub2-efi + LOADER=grub.efi + CONFIG=grub.cfg + TARGET=boot.cfg +elif [ -f /boot/efi/EFI/fedora/grubx64.efi ]; then + DIR=fedora + LOADER=grubx64.efi + CONFIG=grub.cfg + TARGET=boot.cfg +else + exit +fi + +SYSDIR=/boot/efi/System/Library/Coreservices +ln -f /boot/efi/EFI/$DIR/$LOADER $SYSDIR/boot.efi +ln -sf ../../../EFI/$DIR/$CONFIG $SYSDIR/$TARGET +hfs-bless /boot/efi/EFI/$DIR/$LOADER + +if [ -f /usr/share/pixmaps/bootloader/fedora.vol ]; then + cp /usr/share/pixmaps/bootloader/fedora.vol /boot/efi/EFI/$DIR/.disk_label +fi + +if [ -f /usr/share/pixmaps/bootloader/fedora.icns ]; then + cp /usr/share/pixmaps/bootloader/fedora.icns /boot/efi/.VolumeIcon.icns; +fi; + diff --git a/mactel-boot.spec b/mactel-boot.spec new file mode 100644 index 0000000..c46d5f4 --- /dev/null +++ b/mactel-boot.spec @@ -0,0 +1,169 @@ +Name: mactel-boot +Version: 0.9 +Release: 34%{?dist} +Summary: Intel Mac boot files + +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later +URL: http://www.codon.org.uk/~mjg59/mactel-boot/ +Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 +Source1: mactel-boot-setup +Patch0: mactel-boot-c99.patch + +ExclusiveArch: x86_64 + +Requires: coreutils + +BuildRequires: make +BuildRequires: gcc +%description +Files for booting Fedora on Intel-based Apple hardware using EFI. + +%prep +%autosetup -p1 + +%build +make PRODUCTVERSION="Fedora %{fedora}" %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT +install -D -m 644 SystemVersion.plist $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/SystemVersion.plist +echo "This file is required for booting" >$RPM_BUILD_ROOT/boot/efi/mach_kernel +touch $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/boot.efi +touch $RPM_BUILD_ROOT/boot/efi/.VolumeIcon.icns +install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup + +%files +%license GPL +%license Copyright +/usr/share/man/man1/hfs-bless.1.gz +/boot/efi/mach_kernel +%dir /boot/efi/System/ +%dir /boot/efi/System/Library/ +%dir /boot/efi/System/Library/CoreServices/ +/boot/efi/System/Library/CoreServices/SystemVersion.plist +/usr/sbin/hfs-bless +/usr/libexec/mactel-boot-setup +%attr(0755, root, root) %ghost /boot/efi/System/Library/CoreServices/boot.efi +%attr(0644, root, root) %ghost /boot/efi/.VolumeIcon.icns + +%triggerin -- grub-efi grub2-efi fedora-logos generic-logos +/usr/libexec/mactel-boot-setup + +%changelog +* Fri Jul 26 2024 Miroslav Suchý - 0.9-34 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 0.9-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 0.9-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.9-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.9-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Feb 17 2023 Florian Weimer - 0.9-29 +- Port to C99 (#2170958) + +* Thu Jan 19 2023 Fedora Release Engineering - 0.9-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 0.9-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 0.9-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 0.9-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 0.9-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 0.9-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.9-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 0.9-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 13 2019 Peter Robinson 0.9-20 +- Own all the directories, use %%license + +* Fri Feb 01 2019 Fedora Release Engineering - 0.9-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 0.9-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 0.9-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.9-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 0.9-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 0.9-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 0.9-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 0.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 0.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Sep 06 2012 Matthew Garrett - 0.9-7 +- update mactel-boot-setup for F18 + +* Mon May 14 2012 Matthew Garrett - 0.9-6 +- Fix destination path for disk label install + +* Wed Apr 25 2012 Matthew Garrett - 0.9-5 +- Move trigger functionality into an external script + +* Thu Apr 19 2012 Matthew Garrett - 0.9-4 +- Blessing must take place after linking + +* Thu Apr 19 2012 Matthew Garrett - 0.9-3 +- Hardlink the bootloader to boot.efi, rather than symlinking +- Redo the spec file to make better use of macros + +* Tue Feb 28 2012 Matthew Garrett - 0.9-2 +- add support for volume labels + +* Tue Feb 07 2012 Matthew Garrett - 0.9-1 +- new upstream, uses kernel ioctl rather than editing the fs by hand + +* Wed Dec 14 2011 Matthew Garrett - 0.1-4 +- Fix symlinks + +* Tue Dec 13 2011 Matthew Garrett - 0.1-3 +- rename binary to hfs-bless +- make sure writes actually hit disk + +* Mon Nov 21 2011 Matthew Garrett - 0.1-2 +- switch to using triggers +- ensure that the filesystem is HFS+ before running bless + +* Fri Nov 18 2011 Matthew Garrett - 0.1-1 +- initial release diff --git a/sources b/sources new file mode 100644 index 0000000..9993184 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +9933eabcb6305292e76a2542043e421a mactel-boot-0.9.tar.bz2 From ba0bfd9af5675a7968601cf8897cc12c9e211c81 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 20 Mar 2025 20:17:53 -0400 Subject: [PATCH 13/15] Modernize spec and handle sbin-bin merge --- mactel-boot.spec | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index c46d5f4..745927a 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Intel Mac boot files # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -8,14 +8,15 @@ License: GPL-2.0-or-later URL: http://www.codon.org.uk/~mjg59/mactel-boot/ Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 Source1: mactel-boot-setup -Patch0: mactel-boot-c99.patch +Patch0: mactel-boot-c99.patch -ExclusiveArch: x86_64 +ExclusiveArch: %{x86_64} + +BuildRequires: make +BuildRequires: gcc Requires: coreutils -BuildRequires: make -BuildRequires: gcc %description Files for booting Fedora on Intel-based Apple hardware using EFI. @@ -23,34 +24,44 @@ Files for booting Fedora on Intel-based Apple hardware using EFI. %autosetup -p1 %build -make PRODUCTVERSION="Fedora %{fedora}" %{?_smp_mflags} +%make_build PRODUCTVERSION="Fedora %{fedora}" %install -make install DESTDIR=$RPM_BUILD_ROOT -install -D -m 644 SystemVersion.plist $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/SystemVersion.plist -echo "This file is required for booting" >$RPM_BUILD_ROOT/boot/efi/mach_kernel -touch $RPM_BUILD_ROOT/boot/efi/System/Library/CoreServices/boot.efi -touch $RPM_BUILD_ROOT/boot/efi/.VolumeIcon.icns -install -D %{SOURCE1} $RPM_BUILD_ROOT/usr/libexec/mactel-boot-setup +%make_install +install -Dpm 644 SystemVersion.plist %{buildroot}/boot/efi/System/Library/CoreServices/SystemVersion.plist +echo "This file is required for booting" >%{buildroot}/boot/efi/mach_kernel +touch %{buildroot}/boot/efi/System/Library/CoreServices/boot.efi +touch %{buildroot}/boot/efi/.VolumeIcon.icns +install -D %{SOURCE1} %{buildroot}%{_libexecdir}/mactel-boot-setup + +%if "%{_sbindir}" != "/usr/sbin" +# If sbin-bin merge, move everything accordingly +mv %{buildroot}%{_prefix}/sbin/* %{buildroot}%{_sbindir} +rmdir %{buildroot}%{_prefix}/sbin +%endif + %files %license GPL %license Copyright -/usr/share/man/man1/hfs-bless.1.gz +%{_mandir}/man1/hfs-bless.1* /boot/efi/mach_kernel %dir /boot/efi/System/ %dir /boot/efi/System/Library/ %dir /boot/efi/System/Library/CoreServices/ /boot/efi/System/Library/CoreServices/SystemVersion.plist -/usr/sbin/hfs-bless -/usr/libexec/mactel-boot-setup +%{_sbindir}/hfs-bless +%{_libexecdir}/mactel-boot-setup %attr(0755, root, root) %ghost /boot/efi/System/Library/CoreServices/boot.efi %attr(0644, root, root) %ghost /boot/efi/.VolumeIcon.icns %triggerin -- grub-efi grub2-efi fedora-logos generic-logos -/usr/libexec/mactel-boot-setup +%{_libexecdir}/mactel-boot-setup %changelog +* Fri Mar 21 2025 Neal Gompa - 0.9-35 +- Modernize spec and handle sbin-bin merge + * Fri Jul 26 2024 Miroslav Suchý - 0.9-34 - convert license to SPDX From f48f0ee61a7868c8fbdeb9a5ca6264cad8f7df27 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 20 Mar 2025 20:30:00 -0400 Subject: [PATCH 14/15] Fix sbin-bin merge logic --- mactel-boot.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index 745927a..b05374c 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -3,7 +3,6 @@ Version: 0.9 Release: 35%{?dist} Summary: Intel Mac boot files -# Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://www.codon.org.uk/~mjg59/mactel-boot/ Source: http://www.codon.org.uk/~mjg59/mactel-boot/%{name}-%{version}.tar.bz2 @@ -36,6 +35,7 @@ install -D %{SOURCE1} %{buildroot}%{_libexecdir}/mactel-boot-setup %if "%{_sbindir}" != "/usr/sbin" # If sbin-bin merge, move everything accordingly +mkdir -p %{buildroot}%{_sbindir} mv %{buildroot}%{_prefix}/sbin/* %{buildroot}%{_sbindir} rmdir %{buildroot}%{_prefix}/sbin %endif From df65638f098e027daf14b109eb1df561fc05ea49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:11:04 +0000 Subject: [PATCH 15/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mactel-boot.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mactel-boot.spec b/mactel-boot.spec index b05374c..b706cec 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,6 +1,6 @@ Name: mactel-boot Version: 0.9 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Intel Mac boot files License: GPL-2.0-or-later @@ -59,6 +59,9 @@ rmdir %{buildroot}%{_prefix}/sbin %{_libexecdir}/mactel-boot-setup %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.9-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Mar 21 2025 Neal Gompa - 0.9-35 - Modernize spec and handle sbin-bin merge