Fix merge conflict
This commit is contained in:
commit
dd3ef25ab1
@ -21,7 +21,7 @@ downloaded from digital cameras.
|
|||||||
%autosetup -n dcraw
|
%autosetup -n dcraw
|
||||||
|
|
||||||
%build
|
%build
|
||||||
gcc %optflags \
|
gcc %optflags $RPM_LD_FLAGS \
|
||||||
-lm -ljpeg -llcms2 -ljasper \
|
-lm -ljpeg -llcms2 -ljasper \
|
||||||
-DLOCALEDIR="\"%{_datadir}/locale\"" \
|
-DLOCALEDIR="\"%{_datadir}/locale\"" \
|
||||||
-o dcraw dcraw.c
|
-o dcraw dcraw.c
|
||||||
@ -67,6 +67,9 @@ done
|
|||||||
* Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-1
|
* Thu Jun 14 2018 Josef Ridky <jridky@redhat.com> - 9.28.0-1
|
||||||
- New upstream release 9.28.0 (#1585348)
|
- 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
|
* Tue Feb 20 2018 Nils Philippsen <nils@tiptoe.de> - 9.27.0-7
|
||||||
- require gcc for building
|
- require gcc for building
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user