From dd3ef25ab12fc52f5cfb264f7126a5432f795a4e Mon Sep 17 00:00:00 2001
From: Josef Ridky <jridky@redhat.com>
Date: Jun 14 2018 12:02:34 +0000
Subject: Fix merge conflict


---

diff --git a/dcraw.spec b/dcraw.spec
index feb478b..a821b49 100644
--- a/dcraw.spec
+++ b/dcraw.spec
@@ -21,7 +21,7 @@ downloaded from digital cameras.
 %autosetup -n dcraw
 
 %build
-gcc %optflags \
+gcc %optflags $RPM_LD_FLAGS \
     -lm -ljpeg -llcms2 -ljasper \
     -DLOCALEDIR="\"%{_datadir}/locale\"" \
     -o dcraw dcraw.c
@@ -67,6 +67,9 @@ done
 * Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-1
 - New upstream release 9.28.0 (#1585348)
 
+* Fri Feb 23 2018 Florian Weimer <fweimer@redhat.com> - 9.27.0-8
+- Use LDFLAGS from redhat-rpm-config
+
 * Tue Feb 20 2018 Nils Philippsen <nils@tiptoe.de> - 9.27.0-7
 - require gcc for building