diff --git a/fxload-ldflags.patch b/fxload-ldflags.patch deleted file mode 100644 index 2b5639c..0000000 --- a/fxload-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN fxload-2008_10_13.orig/Makefile fxload-2008_10_13/Makefile ---- fxload-2008_10_13.orig/Makefile 2008-10-13 23:44:04.000000000 +0200 -+++ fxload-2008_10_13/Makefile 2020-11-03 16:05:41.516974652 +0100 -@@ -39,7 +39,7 @@ - - # object files - $(PROG): $(FILES_OBJ) -- $(CC) -o $(PROG) $(FILES_OBJ) -+ $(CC) $(LDFLAGS) -o $(PROG) $(FILES_OBJ) - - %.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/fxload-noa3load.patch b/fxload-noa3load.patch index e18b732..7d80fee 100644 --- a/fxload-noa3load.patch +++ b/fxload-noa3load.patch @@ -1,7 +1,7 @@ -diff -up fxload-2008_10_13/fxload.8.fxload-noa3load fxload-2008_10_13/fxload.8 ---- fxload-2008_10_13/fxload.8.fxload-noa3load 2008-10-13 17:44:04.000000000 -0400 -+++ fxload-2008_10_13/fxload.8 2018-02-25 23:33:18.717749708 -0500 -@@ -224,15 +224,6 @@ and some firmware can't be placed in boo +diff -urN fxload-2002_04_11/fxload.8 fxload-2002_04_11-noa3load/fxload.8 +--- fxload-2002_04_11/fxload.8 2002-04-11 22:08:01.000000000 -0600 ++++ fxload-2002_04_11-noa3load/fxload.8 2007-11-16 23:13:40.000000000 -0700 +@@ -217,15 +217,6 @@ .B DEVICE normally names a "usbfs" file that will be used to talk to the device. This is provided by the Linux kernel as part of USB hotplugging. @@ -17,10 +17,10 @@ diff -up fxload-2008_10_13/fxload.8.fxload-noa3load fxload-2008_10_13/fxload.8 .SH "SEE ALSO" .BR hotplug "(8) " .SH "AUTHORS" -diff -up fxload-2008_10_13/README.txt.fxload-noa3load fxload-2008_10_13/README.txt ---- fxload-2008_10_13/README.txt.fxload-noa3load 2008-10-13 17:44:04.000000000 -0400 -+++ fxload-2008_10_13/README.txt 2018-02-25 23:33:18.717749708 -0500 -@@ -11,11 +11,6 @@ firmware on devices which boot from I2C +diff -urN fxload-2002_04_11/README.txt fxload-2002_04_11-noa3load/README.txt +--- fxload-2002_04_11/README.txt 2002-04-11 22:08:01.000000000 -0600 ++++ fxload-2002_04_11-noa3load/README.txt 2007-11-16 23:13:29.000000000 -0700 +@@ -11,11 +11,6 @@ use, as well as downloading firmware to all other off-chip memory, a second stage loader must first be downloaded. diff --git a/fxload.spec b/fxload.spec index 2ecae3f..4145893 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,9 +1,10 @@ Name: fxload Version: 2008_10_13 -Release: 33%{?dist} +Release: 4%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices -License: GPL-2.0-or-later +Group: System Environment/Kernel +License: GPLv2+ URL: http://linux-hotplug.sourceforge.net/ Source0: fxload-%{version}-noa3load.tar.gz # The above file is derived from: @@ -15,124 +16,43 @@ Source0: fxload-%{version}-noa3load.tar.gz # ./fxload-generate-tarball.sh 2008_10_13 Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch -Patch1: fxload-ldflags.patch +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: gcc kernel-headers make +BuildRequires: kernel-headers Requires: udev Conflicts: hotplug-gtk hotplug -%description +%description This program is conveniently able to download firmware into FX and FX2 EZ-USB devices, as well as the original AnchorChips EZ-USB. It is intended to be invoked by udev scripts when the unprogrammed device appears on the bus. %prep -%setup -q -%patch -P0 -p1 -b .fxload-noa3load -%patch -P1 -p1 -b .ldflags +%setup -q +%patch0 -p1 -b .fxload-noa3load -%build -%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" +%build +make %install -install -m 755 -Dt %{buildroot}%{_sbindir}/ fxload -install -m 644 -Dt %{buildroot}%{_mandir}/man8/ fxload.8 +rm -rf %{buildroot} +mkdir -p -m 755 %{buildroot}/sbin +install -m 755 fxload %{buildroot}/sbin +mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/ +install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ + +%clean +rm -rf %{buildroot} %files +%defattr(0644,root,root,0755) %doc COPYING %doc README.txt -%{_sbindir}/fxload -%{_mandir}/man8/fxload.8* +%attr(0755, root, root) /sbin/fxload +%{_mandir}/*/* %changelog -* Wed Oct 22 2025 Zbigniew Jędrzejewski-Szmek - 2008_10_13-33 -- Use %%_sbindir for the binary (rhbz#2405414) - -* Wed Jul 23 2025 Fedora Release Engineering - 2008_10_13-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 2008_10_13-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 18 2024 Jaroslav Kysela - 2008_10_13-29 -- use /usr/sbin directory - -* Wed Jul 17 2024 Fedora Release Engineering - 2008_10_13-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 2008_10_13-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2008_10_13-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 7 2023 Jaroslav Kysela - 2008_10_13-25 -- SPDX license - -* Wed Jul 19 2023 Fedora Release Engineering - 2008_10_13-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 2008_10_13-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2008_10_13-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 2008_10_13-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 2008_10_13-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2008_10_13-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 08 2020 Charles R. Anderson - 2008_10_13-18 -- BR: make - -* Tue Dec 08 2020 Charles R. Anderson - 2008_10_13-17 -- Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro - -* Mon Jul 27 2020 Fedora Release Engineering - 2008_10_13-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Feb 03 2020 Tom Stellard - 2008_10_13-15 -- Use __cc macro instead of hard-coding gcc - -* Tue Jan 28 2020 Fedora Release Engineering - 2008_10_13-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2008_10_13-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 2008_10_13-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2008_10_13-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Feb 25 2018 Charles R. Anderson - 2008_10_13-10 -- Patch to apply CFLAGS/LDFLAGS to final link so RPM_OPT_FLAGS are picked up (rhbz#1548426) -- Use CC=gcc explicitly -- Regenerate fxload-noa3load.patch - -* Sun Feb 18 2018 Charles R. Anderson - 2008_10_13-9 -- add BR gcc -- remove Group:, BuildRoot: and rm -rf in install section - -* Wed Feb 07 2018 Fedora Release Engineering - 2008_10_13-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 2008_10_13-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2008_10_13-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2008_10_13-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - * Wed Feb 03 2016 Fedora Release Engineering - 2008_10_13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild