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.spec b/mactel-boot.spec index b706cec..10c8290 100644 --- a/mactel-boot.spec +++ b/mactel-boot.spec @@ -1,100 +1,54 @@ Name: mactel-boot Version: 0.9 -Release: 36%{?dist} +Release: 24%{?dist} Summary: Intel Mac boot files -License: GPL-2.0-or-later +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} - -BuildRequires: make -BuildRequires: gcc +ExclusiveArch: x86_64 Requires: coreutils +BuildRequires: make +BuildRequires: gcc %description Files for booting Fedora on Intel-based Apple hardware using EFI. %prep -%autosetup -p1 +%setup -q %build -%make_build PRODUCTVERSION="Fedora %{fedora}" +make PRODUCTVERSION="Fedora %{fedora}" %{?_smp_mflags} %install -%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 -mkdir -p %{buildroot}%{_sbindir} -mv %{buildroot}%{_prefix}/sbin/* %{buildroot}%{_sbindir} -rmdir %{buildroot}%{_prefix}/sbin -%endif - +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 -%{_mandir}/man1/hfs-bless.1* +/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 -%{_sbindir}/hfs-bless -%{_libexecdir}/mactel-boot-setup +/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 -%{_libexecdir}/mactel-boot-setup +/usr/libexec/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 - -* 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