use %qmake_qt4 macro to ensure proper build flags
This commit is contained in:
parent
38cff71ea0
commit
b3190cbcc3
@ -3,7 +3,7 @@
|
||||
|
||||
Name: bacula
|
||||
Version: 7.4.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Cross platform network backup for Linux, Unix, Mac and Windows
|
||||
# See LICENSE for details
|
||||
License: AGPLv3 with exceptions
|
||||
@ -378,7 +378,6 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
|
||||
}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
export QMAKE=/usr/bin/qmake-qt4
|
||||
build --enable-bat
|
||||
%else
|
||||
build --disable-bat
|
||||
@ -393,7 +392,7 @@ make -C examples/nagios/check_bacula
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 6
|
||||
pushd src/qt-console/tray-monitor
|
||||
$QMAKE tray-monitor.pro
|
||||
%{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
|
||||
make %{?_smp_mflags}
|
||||
cp -f .libs/bacula-tray-monitor .
|
||||
popd
|
||||
@ -771,6 +770,9 @@ fi
|
||||
%{_libdir}/nagios/plugins/check_bacula
|
||||
|
||||
%changelog
|
||||
* Mon Feb 01 2016 Rex Dieter <rdieter@fedoraproject.org> - 7.4.0-2
|
||||
- use %%qmake_qt4 macro to ensure proper build flags
|
||||
|
||||
* Mon Jan 25 2016 Simone Caronni <negativo17@gmail.com> - 7.4.0-1
|
||||
- Update to 7.4.0.
|
||||
- Rebase patches, remove git patch.
|
||||
|
Loading…
Reference in New Issue
Block a user