From bb730ba0beb25e4ff8f74fb2319a202fc0127355 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 1 Feb 2016 11:31:15 -0600 Subject: [PATCH] use %qmake_qt5 macro (instead of settings flags by hand) --- engauge-digitizer.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engauge-digitizer.spec b/engauge-digitizer.spec index 3b8d406..ec2e71b 100644 --- a/engauge-digitizer.spec +++ b/engauge-digitizer.spec @@ -5,7 +5,7 @@ Name: engauge-digitizer Summary: Convert graphs or map files into numbers Version: 6.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Engineering License: GPLv2+ URL: https://github.com/markummitchell/engauge6 @@ -162,10 +162,7 @@ export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1 export JPEG2000_LIB=%{_libdir} %endif export ENGAUGE_RELEASE=1 -qmake-qt5 -makefile engauge.pro \ - QMAKE_CFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now" \ - QMAKE_CXXFLAGS="$RPM_OPT_FLAGS $RPM_LD_FLAGS -Wl,-z,now" \ - QMAKE_LFLAGS="$RPM_LD_FLAGS -Wl,-z,now" \ +%{qmake_qt5} -makefile engauge.pro \ DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help make %{?_smp_mflags} @@ -274,6 +271,9 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests %license LICENSE %changelog +* Mon Feb 01 2016 Rex Dieter 1:6.2-2 +- use %%qmake_qt5 macro (instead of settings flags by hand) + * Tue Dec 01 2015 Antonio Trande - 1:6.2-1 - Update to 6.2