diff --git a/fxload-cflags-ldflags.patch b/fxload-cflags-ldflags.patch new file mode 100644 index 0000000..ce7e7ed --- /dev/null +++ b/fxload-cflags-ldflags.patch @@ -0,0 +1,12 @@ +diff -up fxload-2008_10_13/Makefile.cflags fxload-2008_10_13/Makefile +--- fxload-2008_10_13/Makefile.cflags 2008-10-13 17:44:04.000000000 -0400 ++++ fxload-2008_10_13/Makefile 2018-02-25 23:11:02.416103160 -0500 +@@ -39,7 +39,7 @@ release: rpms + + # object files + $(PROG): $(FILES_OBJ) +- $(CC) -o $(PROG) $(FILES_OBJ) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(FILES_OBJ) + + %.o: %.c + $(CC) -c $(CFLAGS) $< -o $@ 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.spec b/fxload.spec index 2ecae3f..66d72bf 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,9 +1,9 @@ Name: fxload Version: 2008_10_13 -Release: 33%{?dist} +Release: 15%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices -License: GPL-2.0-or-later +License: GPLv2+ URL: http://linux-hotplug.sourceforge.net/ Source0: fxload-%{version}-noa3load.tar.gz # The above file is derived from: @@ -15,88 +15,39 @@ 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 +Patch1: fxload-cflags-ldflags.patch -BuildRequires: gcc kernel-headers make +BuildRequires: gcc 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 +%patch1 -p1 -b .cflags -%build -%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" +%build +make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %install -install -m 755 -Dt %{buildroot}%{_sbindir}/ fxload -install -m 644 -Dt %{buildroot}%{_mandir}/man8/ fxload.8 +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/ %files %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