rpms/bacula
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use %qmake_qt4 macro to ensure proper build flags

Browse Source
This commit is contained in:
Rex Dieter 2016-02-01 13:03:48 -06:00
parent 38cff71ea0
commit b3190cbcc3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bacula.spec
View File

@ -3,7 +3,7 @@
Name: bacula Name: bacula
Version: 7.4.0 Version: 7.4.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Cross platform network backup for Linux, Unix, Mac and Windows Summary: Cross platform network backup for Linux, Unix, Mac and Windows
# See LICENSE for details # See LICENSE for details
License: AGPLv3 with exceptions License: AGPLv3 with exceptions
@ -378,7 +378,6 @@ export CPPFLAGS="$RPM_OPT_FLAGS -I%{_includedir}/ncurses"
} }
%if 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} || 0%{?rhel} >= 6
export QMAKE=/usr/bin/qmake-qt4
build --enable-bat build --enable-bat
%else %else
build --disable-bat build --disable-bat
@ -393,7 +392,7 @@ make -C examples/nagios/check_bacula
%if 0%{?fedora} || 0%{?rhel} >= 6 %if 0%{?fedora} || 0%{?rhel} >= 6
pushd src/qt-console/tray-monitor pushd src/qt-console/tray-monitor
$QMAKE tray-monitor.pro %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
make %{?_smp_mflags} make %{?_smp_mflags}
cp -f .libs/bacula-tray-monitor . cp -f .libs/bacula-tray-monitor .
popd popd
@ -771,6 +770,9 @@ fi
%{_libdir}/nagios/plugins/check_bacula %{_libdir}/nagios/plugins/check_bacula
%changelog %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 * Mon Jan 25 2016 Simone Caronni <negativo17@gmail.com> - 7.4.0-1
- Update to 7.4.0. - Update to 7.4.0.
- Rebase patches, remove git patch. - Rebase patches, remove git patch.