use %qmake_qt5 macro (instead of settings flags by hand)
This commit is contained in:
parent
7f7d2295c3
commit
bb730ba0be
|
@ -5,7 +5,7 @@
|
||||||
Name: engauge-digitizer
|
Name: engauge-digitizer
|
||||||
Summary: Convert graphs or map files into numbers
|
Summary: Convert graphs or map files into numbers
|
||||||
Version: 6.2
|
Version: 6.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Group: Applications/Engineering
|
Group: Applications/Engineering
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://github.com/markummitchell/engauge6
|
URL: https://github.com/markummitchell/engauge6
|
||||||
|
@ -162,10 +162,7 @@ export JPEG2000_INCLUDE=%{_includedir}/openjpeg-2.1
|
||||||
export JPEG2000_LIB=%{_libdir}
|
export JPEG2000_LIB=%{_libdir}
|
||||||
%endif
|
%endif
|
||||||
export ENGAUGE_RELEASE=1
|
export ENGAUGE_RELEASE=1
|
||||||
qmake-qt5 -makefile engauge.pro \
|
%{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" \
|
|
||||||
DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
|
DEFINES+=HELPDIR=%{_datadir}/doc/%{name}/help
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
@ -274,6 +271,9 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Feb 01 2016 Rex Dieter <rdieter@fedoraproject.org> 1:6.2-2
|
||||||
|
- use %%qmake_qt5 macro (instead of settings flags by hand)
|
||||||
|
|
||||||
* Tue Dec 01 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-1
|
* Tue Dec 01 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.2-1
|
||||||
- Update to 6.2
|
- Update to 6.2
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue