From 0a41a91f737258b0324aae51e47553be4682017c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 08:56:18 +0000 Subject: [PATCH 01/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 7973c71..66b7901 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices Group: System Environment/Kernel @@ -53,6 +53,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* 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 From 2a053add8b12bc497cedea2f2ccc8a5529ce88dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:53:58 +0000 Subject: [PATCH 02/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 66b7901..b2c33e3 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices Group: System Environment/Kernel @@ -53,6 +53,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* 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 From 3c32da4b466fea62b2b55de9e1909655dae93a1d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 10:23:25 +0000 Subject: [PATCH 03/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index b2c33e3..b6bfdcd 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices Group: System Environment/Kernel @@ -53,6 +53,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* 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 From 8110bc82b15cbbe08b955563cc2038c61387bfeb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:24:18 +0100 Subject: [PATCH 04/35] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- fxload.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index b6bfdcd..f495838 100644 --- a/fxload.spec +++ b/fxload.spec @@ -16,7 +16,6 @@ Source0: fxload-%{version}-noa3load.tar.gz # ./fxload-generate-tarball.sh 2008_10_13 Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: kernel-headers Requires: udev From 6b848004bc07b6f27081c7e9fc8636896967e508 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:13:22 +0100 Subject: [PATCH 05/35] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- fxload.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/fxload.spec b/fxload.spec index f495838..1c9a500 100644 --- a/fxload.spec +++ b/fxload.spec @@ -41,9 +41,6 @@ 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 From 4316feb3576e7c13554ab21df9291fada6089201 Mon Sep 17 00:00:00 2001 From: "Charles R. Anderson" Date: Sun, 18 Feb 2018 19:10:48 -0500 Subject: [PATCH 06/35] add BR gcc, remove Group:, BuildRoot: and rm -rf in install section --- fxload.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fxload.spec b/fxload.spec index 7fbe6b1..757d9c5 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,9 +1,8 @@ Name: fxload Version: 2008_10_13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices -Group: System Environment/Kernel License: GPLv2+ URL: http://linux-hotplug.sourceforge.net/ Source0: fxload-%{version}-noa3load.tar.gz @@ -16,9 +15,8 @@ Source0: fxload-%{version}-noa3load.tar.gz # ./fxload-generate-tarball.sh 2008_10_13 Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -BuildRequires: kernel-headers +BuildRequires: gcc kernel-headers Requires: udev Conflicts: hotplug-gtk hotplug @@ -36,15 +34,11 @@ appears on the bus. make %install -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 @@ -53,6 +47,10 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* Sun Feb 18 2018 Charles R. Anderson - 2008_10_13-2 +- add BR gcc +- remove Group:, BuildRoot: and rm -rf in install section + * Mon Jun 16 2014 Charles R. Anderson - 2008_10_13-1 - update to 2008_10_13 to support Cypress EZ-USB FX2LP parts (rhbz#1102654) From f258aba29b1b4406c0890ce7a7863a9c3cae48aa Mon Sep 17 00:00:00 2001 From: "Charles R. Anderson" Date: Sun, 25 Feb 2018 23:41:50 -0500 Subject: [PATCH 07/35] 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 --- fxload-cflags-ldflags.patch | 12 ++++++++++++ fxload-noa3load.patch | 16 ++++++++-------- fxload.spec | 11 +++++++++-- 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 fxload-cflags-ldflags.patch 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-noa3load.patch b/fxload-noa3load.patch index 7d80fee..e18b732 100644 --- a/fxload-noa3load.patch +++ b/fxload-noa3load.patch @@ -1,7 +1,7 @@ -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 @@ +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 .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 -urN fxload-2002_04_11/fxload.8 fxload-2002_04_11-noa3load/fxload.8 .SH "SEE ALSO" .BR hotplug "(8) " .SH "AUTHORS" -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 @@ +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 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 3cc016f..aaf9b92 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -15,6 +15,7 @@ Source0: fxload-%{version}-noa3load.tar.gz # ./fxload-generate-tarball.sh 2008_10_13 Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch +Patch1: fxload-cflags-ldflags.patch BuildRequires: gcc kernel-headers Requires: udev @@ -29,9 +30,10 @@ appears on the bus. %prep %setup -q %patch0 -p1 -b .fxload-noa3load +%patch1 -p1 -b .cflags %build -make +make CC=gcc CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %install mkdir -p -m 755 %{buildroot}/sbin @@ -47,6 +49,11 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From dceb9234840b2b92c9124005322813153bcd87ec Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:53:59 -0500 Subject: [PATCH 08/35] Remove needless use of %defattr --- fxload.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index aaf9b92..6e4dc67 100644 --- a/fxload.spec +++ b/fxload.spec @@ -42,7 +42,6 @@ mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %files -%defattr(0644,root,root,0755) %doc COPYING %doc README.txt %attr(0755, root, root) /sbin/fxload From 63af44d16d23c9bf3ddae8310c7372877be09fbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:58:57 +0000 Subject: [PATCH 09/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 6e4dc67..f1840a0 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 872c6471fc9f02154d55ab89e8eaa7bdc4f35056 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 20:21:41 +0000 Subject: [PATCH 10/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index f1840a0..256a207 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 32540347fa2b2046db5a5adb6f627012091820c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 01:14:07 +0000 Subject: [PATCH 11/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 256a207..83def5f 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 796f77ad78f3146dd3a2aebb54940f067abc5c6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 19:12:30 +0000 Subject: [PATCH 12/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 83def5f..3b7dadf 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 11b7fa4b8a38327876c8dfcb94ad497ae873c198 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jan 2020 23:08:01 +0000 Subject: [PATCH 13/35] Use __cc macro instead of hard-coding gcc --- fxload.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fxload.spec b/fxload.spec index 3b7dadf..66d72bf 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -33,7 +33,7 @@ appears on the bus. %patch1 -p1 -b .cflags %build -make CC=gcc CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %install mkdir -p -m 755 %{buildroot}/sbin @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From f2e984585135d4dacb9b86b13f0bc06102e2355c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 17:59:28 +0000 Subject: [PATCH 14/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 66d72bf..483a26f 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From ec0ec052112184395acacbf19c8c4298425376b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 3 Nov 2020 16:03:04 +0100 Subject: [PATCH 15/35] Remove cflags-ldflags patch This patch added the CFLAGS to linking as well, which breaks and annocheck complains: Hardened: fxload: FAIL: Compiled without using either the -Wall or -Wformat-security options. Run with -v to see where. A later patch will add the LDFLAGS back at the same place --- fxload-cflags-ldflags.patch | 12 ------------ fxload.spec | 2 -- 2 files changed, 14 deletions(-) delete mode 100644 fxload-cflags-ldflags.patch diff --git a/fxload-cflags-ldflags.patch b/fxload-cflags-ldflags.patch deleted file mode 100644 index ce7e7ed..0000000 --- a/fxload-cflags-ldflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.spec b/fxload.spec index 483a26f..be8b321 100644 --- a/fxload.spec +++ b/fxload.spec @@ -15,7 +15,6 @@ Source0: fxload-%{version}-noa3load.tar.gz # ./fxload-generate-tarball.sh 2008_10_13 Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch -Patch1: fxload-cflags-ldflags.patch BuildRequires: gcc kernel-headers Requires: udev @@ -30,7 +29,6 @@ appears on the bus. %prep %setup -q %patch0 -p1 -b .fxload-noa3load -%patch1 -p1 -b .cflags %build make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" From 730a21a5908a358d4bbc681a6be5ac5b575f4fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 3 Nov 2020 16:10:53 +0100 Subject: [PATCH 16/35] Add LDFLAGS to linking Add the usual LDFLAGS when linking. --- fxload-ldflags.patch | 12 ++++++++++++ fxload.spec | 2 ++ 2 files changed, 14 insertions(+) create mode 100644 fxload-ldflags.patch diff --git a/fxload-ldflags.patch b/fxload-ldflags.patch new file mode 100644 index 0000000..2b5639c --- /dev/null +++ b/fxload-ldflags.patch @@ -0,0 +1,12 @@ +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 be8b321..ef97477 100644 --- a/fxload.spec +++ b/fxload.spec @@ -15,6 +15,7 @@ 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 BuildRequires: gcc kernel-headers Requires: udev @@ -29,6 +30,7 @@ appears on the bus. %prep %setup -q %patch0 -p1 -b .fxload-noa3load +%patch1 -p1 -b .ldflags %build make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" From 9cc177f43868043a3d2a0e8f8af2d353cd77695e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 3 Nov 2020 16:13:39 +0100 Subject: [PATCH 17/35] spec: Use %{make_build} macro --- fxload.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index ef97477..09bb9ee 100644 --- a/fxload.spec +++ b/fxload.spec @@ -33,7 +33,7 @@ appears on the bus. %patch1 -p1 -b .ldflags %build -make CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %install mkdir -p -m 755 %{buildroot}/sbin From 77c33a552311b8048695423b8ede7d97cbced086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Tue, 3 Nov 2020 16:14:29 +0100 Subject: [PATCH 18/35] spec: Pass -pie via LDFLAGS This makes the clang build succeed. --- fxload.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 09bb9ee..3b1ac67 100644 --- a/fxload.spec +++ b/fxload.spec @@ -33,7 +33,7 @@ appears on the bus. %patch1 -p1 -b .ldflags %build -%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +%{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" %install mkdir -p -m 755 %{buildroot}/sbin From 6719e23cab82576db9394b449e3233860a79db81 Mon Sep 17 00:00:00 2001 From: "Charles R. Anderson" Date: Tue, 8 Dec 2020 15:48:09 -0500 Subject: [PATCH 19/35] Merge PR#2: Make annocheck pass, pass -pie to linker, use make_build macro --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 3b1ac67..82696ba 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From aa3998958212ba5b42ff6f10bc35a5bdcbfb100c Mon Sep 17 00:00:00 2001 From: "Charles R. Anderson" Date: Tue, 8 Dec 2020 15:58:44 -0500 Subject: [PATCH 20/35] BuildRequires make --- fxload.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fxload.spec b/fxload.spec index 82696ba..5f7ea84 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -17,7 +17,7 @@ Source1: fxload-generate-tarball.sh Patch0: fxload-noa3load.patch Patch1: fxload-ldflags.patch -BuildRequires: gcc kernel-headers +BuildRequires: gcc kernel-headers make Requires: udev Conflicts: hotplug-gtk hotplug @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 30e9110fa71da84fadc467391ea755b27c9347d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 06:05:07 +0000 Subject: [PATCH 21/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 5f7ea84..8c2b446 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 18%{?dist} +Release: 19%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From a79cce463fd12283617cbde15f5a28171c1a3472 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 23:31:48 +0000 Subject: [PATCH 22/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 8c2b446..99f7cac 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 19%{?dist} +Release: 20%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 7bc929d8dad8679bd62382dc4c1f69701834a09d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 03:36:21 +0000 Subject: [PATCH 23/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 99f7cac..d1d2bc0 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 20%{?dist} +Release: 21%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 63e4bb9589cca96af9f2a2f2c0532e326f0956bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 03:48:50 +0000 Subject: [PATCH 24/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index d1d2bc0..b5fd134 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 21%{?dist} +Release: 22%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From dea97a460e55f3caf994616f36c610a773451dec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 04:04:51 +0000 Subject: [PATCH 25/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index b5fd134..b422d0e 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 22%{?dist} +Release: 23%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 2e7b74bcd00fe86a3254e6e49fd292897af9f20b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:28:06 +0000 Subject: [PATCH 26/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index b422d0e..44b52e8 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 23%{?dist} +Release: 24%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPLv2+ @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 0dc3e3277f0a05b6f339387495aa2ef23e215a73 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 6 Jun 2023 20:46:06 +0200 Subject: [PATCH 27/35] SPDX license --- fxload.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fxload.spec b/fxload.spec index 44b52e8..f962a59 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,9 +1,9 @@ Name: fxload Version: 2008_10_13 -Release: 24%{?dist} +Release: 25%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices -License: GPLv2+ +License: GPL-2.0-or-later URL: http://linux-hotplug.sourceforge.net/ Source0: fxload-%{version}-noa3load.tar.gz # The above file is derived from: @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 842216ec5cd21afe69644b601884a5ea4d72b255 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:58:47 +0000 Subject: [PATCH 28/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index f962a59..1ab8df3 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 25%{?dist} +Release: 26%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From bf5281c382d16747787eaf54bac7b4aabc0321be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:13:12 +0000 Subject: [PATCH 29/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 1ab8df3..7b29625 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 26%{?dist} +Release: 27%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From ba7df3e1f23ded924332b0a6120b233c567d751c Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 30/35] Eliminate use of obsolete %patchN syntax (#2283636) --- fxload.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fxload.spec b/fxload.spec index 7b29625..37fb523 100644 --- a/fxload.spec +++ b/fxload.spec @@ -29,8 +29,8 @@ appears on the bus. %prep %setup -q -%patch0 -p1 -b .fxload-noa3load -%patch1 -p1 -b .ldflags +%patch -P0 -p1 -b .fxload-noa3load +%patch -P1 -p1 -b .ldflags %build %{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" From f2cd3ded56c0608cdc67eec752cbcd2d2dae49e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:50:42 +0000 Subject: [PATCH 31/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 37fb523..81529b1 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 27%{?dist} +Release: 28%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 28b45e2a7913408cc5dbea12548f9ffff1e12c8f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 18 Dec 2024 11:39:17 +0100 Subject: [PATCH 32/35] Use /usr/sbin directory --- fxload.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/fxload.spec b/fxload.spec index 81529b1..9c750c3 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 28%{?dist} +Release: 29%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -36,18 +36,21 @@ appears on the bus. %{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" %install -mkdir -p -m 755 %{buildroot}/sbin -install -m 755 fxload %{buildroot}/sbin +mkdir -p -m 755 %{buildroot}/usr/sbin +install -m 755 fxload %{buildroot}/usr/sbin mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %files %doc COPYING %doc README.txt -%attr(0755, root, root) /sbin/fxload +%attr(0755, root, root) /usr/sbin/fxload %{_mandir}/*/* %changelog +* 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 From 37f46a5adadb082a1157110147b08467a11cee78 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 19:04:04 +0000 Subject: [PATCH 33/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 9c750c3..1ed28ad 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 29%{?dist} +Release: 30%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 755823fbb197945a44c18271022786d5a6cf9d08 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:54:42 +0000 Subject: [PATCH 34/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fxload.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fxload.spec b/fxload.spec index 1ed28ad..adcf594 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 30%{?dist} +Release: 31%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ %{_mandir}/*/* %changelog +* 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 From 65b17bc69e976afbf7d088774ed51d3ae3f44f22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 22 Oct 2025 09:20:00 +0200 Subject: [PATCH 35/35] Use %_sbindir for the binary This effectively moves the binary to /usr/bin/ on any recent Fedora system. --- fxload.spec | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/fxload.spec b/fxload.spec index adcf594..2ecae3f 100644 --- a/fxload.spec +++ b/fxload.spec @@ -1,6 +1,6 @@ Name: fxload Version: 2008_10_13 -Release: 31%{?dist} +Release: 33%{?dist} Summary: A helper program to download firmware into FX and FX2 EZ-USB devices License: GPL-2.0-or-later @@ -21,33 +21,34 @@ BuildRequires: gcc kernel-headers make 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 +%setup -q %patch -P0 -p1 -b .fxload-noa3load %patch -P1 -p1 -b .ldflags -%build +%build %{make_build} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS -pie" %install -mkdir -p -m 755 %{buildroot}/usr/sbin -install -m 755 fxload %{buildroot}/usr/sbin -mkdir -p -m 755 %{buildroot}/%{_mandir}/man8/ -install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/ +install -m 755 -Dt %{buildroot}%{_sbindir}/ fxload +install -m 644 -Dt %{buildroot}%{_mandir}/man8/ fxload.8 %files %doc COPYING %doc README.txt -%attr(0755, root, root) /usr/sbin/fxload -%{_mandir}/*/* +%{_sbindir}/fxload +%{_mandir}/man8/fxload.8* %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