From d5742fcc6d0f6c5cc311bccc333bf1dec339ee79 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 11 Dec 2020 12:17:10 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/fxload.git#6719e23cab82576db9394b449e3233860a79db81
---
 fxload-cflags-ldflags.patch | 12 ------------
 fxload-ldflags.patch        | 12 ++++++++++++
 fxload.spec                 | 11 +++++++----
 3 files changed, 19 insertions(+), 16 deletions(-)
 delete mode 100644 fxload-cflags-ldflags.patch
 create mode 100644 fxload-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-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 483a26f..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+
@@ -15,7 +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
+Patch1: fxload-ldflags.patch
 
 BuildRequires: gcc kernel-headers
 Requires: udev
@@ -30,10 +30,10 @@ appears on the bus.
 %prep
 %setup -q 
 %patch0 -p1 -b .fxload-noa3load
-%patch1 -p1 -b .cflags
+%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 -pie"
 
 %install
 mkdir -p -m 755 %{buildroot}/sbin
@@ -48,6 +48,9 @@ install -m 644 fxload.8 %{buildroot}/%{_mandir}/man8/
 %{_mandir}/*/*
 
 %changelog
+* Tue Dec 08 2020 Charles R. Anderson <cra@alum.wpi.edu> - 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 <releng@fedoraproject.org> - 2008_10_13-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild