SPECS/syslinux.spec

@@ -7,8 +7,9 @@ Summary: Simple kernel loader which boots from a FAT filesystem
 Name: syslinux
 Version: 6.04
 %define tarball_version 6.04-pre1
-Release: 0.20%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
+Group: Applications/System
 URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project
 Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz
 Source1: syslinux.patches
@@ -19,12 +20,10 @@ Source1: syslinux.patches
 # in noarch packages are a reason to stop the build.
 %define _binaries_in_noarch_packages_terminate_build 0
 
-BuildRequires: make
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: git
 %ifarch %{buildarches}
-BuildRequires:  gcc
 BuildRequires: nasm >= 0.98.38-1, perl-interpreter, perl-generators, netpbm-progs
-BuildRequires: perl(FileHandle)
 BuildRequires: /usr/include/gnu/stubs-32.h
 BuildRequires: libuuid-devel
 Requires: syslinux-nonlinux = %{version}-%{release}
@@ -50,12 +49,14 @@ MEMDISK, which loads legacy operating systems from these media.
 
 %package perl
 Summary: Syslinux tools written in perl
+Group: Applications/System
 
 %description perl
 Syslinux tools written in perl
 
 %package devel
 Summary: Headers and libraries for syslinux development.
+Group: Development/Libraries
 Provides: %{name}-static = %{version}-%{release}
 
 %description devel
@@ -63,6 +64,7 @@ Headers and libraries for syslinux development.
 
 %package extlinux
 Summary: The EXTLINUX bootloader, for booting the local system.
+Group: System/Boot
 Requires: syslinux
 Requires: syslinux-extlinux-nonlinux = %{version}-%{release}
 
@@ -73,6 +75,7 @@ the SYSLINUX/PXELINUX modules in /boot.
 %ifarch %{ix86}
 %package tftpboot
 Summary: SYSLINUX modules in /tftpboot, available for network booting
+Group: Applications/Internet
 BuildArch: noarch
 
 %description tftpboot
@@ -81,6 +84,7 @@ booting in the /tftpboot directory.
 
 %package extlinux-nonlinux
 Summary: The parts of the EXTLINUX bootloader which aren't run from linux.
+Group: System/Boot
 Requires: syslinux
 BuildArch: noarch
 ExclusiveArch: %{ix86} x86_64
@@ -91,6 +95,7 @@ from a linux host.
 
 %package nonlinux
 Summary: SYSLINUX modules which aren't run from linux.
+Group: System/Boot
 Requires: syslinux
 BuildArch: noarch
 ExclusiveArch: %{ix86} x86_64
@@ -104,6 +109,7 @@ systems from media.
 %ifarch x86_64
 %package efi64
 Summary: SYSLINUX binaries and modules for 64-bit UEFI systems
+Group: System/Boot
 
 %description efi64
 SYSLINUX binaries and modules for 64-bit UEFI systems
@@ -153,8 +159,12 @@ rm -f %{buildroot}%{_prefix}/lib/libsyslinux*
 rm -f %{buildroot}%{_includedir}/syslinux.h
 %endif
 
+%clean
+rm -rf %{buildroot}
+
 %ifarch %{buildarches}
 %files
+%defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %doc NEWS README*
@@ -181,6 +191,7 @@ rm -f %{buildroot}%{_includedir}/syslinux.h
 %endif
 
 %files perl
+%defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %{_mandir}/man1/lss16toppm*
@@ -197,6 +208,7 @@ rm -f %{buildroot}%{_includedir}/syslinux.h
 %{_bindir}/isohybrid.pl
 
 %files devel
+%defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %dir %{_datadir}/syslinux/com32
@@ -253,45 +265,29 @@ fi
 %endif
 
 %changelog
-* Wed Aug 03 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-0.20
-- Sync with fedora (same NVR)
-- Resolves: #2018260
+* Wed Aug 03 2022 Robbie Harwood <rharwood@redhat.com> - 6.04-6
+- Sync with RHEL 9 / Fedora at their 6.04-0.20
+- Resolves: #1748014
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 6.04-0.19
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Nov 13 2020 Javier Martinez Canillas <javierm@redhat.com> - 6.04-5
+- Bump release to ship the syslinux-tftpboot subpackage on aarch64
+  Resolves: rhbz#1870276
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 6.04-0.18
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Sep 24 2019 Yaakov Selkowitz <yselkowi@redhat.com> - 6.04-4
+- Make tftpboot subpackage completely noarch
+  Resolves: rhbz#1745205
 
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Tue Aug 27 2019 Javier Martinez Canillas <javierm@redhat.com> 6.04-3
+  Drop x86_64 ExclusiveArch for tftpboot subpackage
+  Resolves: rhbz#1745205
 
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Thu Aug 08 2019 Peter Jones <pjones@redhat.com> - 6.04-2
+- Fix a bunch of annocheck problems
+  Resolves: rhbz#1624176
 
-* Wed May 13 2020 Merlin Mathesius <mmathesi@redhat.com> - 6.04-0.15
-- Patches to fix FTBFS in F32/F33/ELN (RHBZ#1800180)
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Sep 27 2019 Javier Martinez Canillas <javierm@redhat.com> - 6.04-0.13
-- Fix a bunch of annocheck problems (pjones)
-- Drop x86_64 ExclusiveArch for tftpboot subpackage
-- Make tftpboot subpackage completely noarch (yselkowi)
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri May 10 2019 Scott Talbert <swt@techie.net> - 6.04-0.11
-- Add upstream patch to include sysmacros.h to fix FTBFS (#1676107)
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri Aug 10 2018 Peter Jones <pjones@redhat.com> - 6.04-1
+- extlinux: fix missing include for major()/minor()
+  Resolves: rhbz#1611751
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.04-0.8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild