Skip to content

Commit

Permalink
Fix problems on Fedora 19 and 21.
Browse files Browse the repository at this point in the history
Glusterfs on Fedora 19 seems to be old and as such does not allow us to
build the gfapi-fd plugin. As Fedora 19 is not supported anyway it makes
little sense to add a lot of work to make the gluster stuff work on that
platform.

On Fedora 21 it seems the compile flags are more strict which leads to
the following error:

tray-monitor.cpp:65:32: error: format not a string literal and no format
arguments [-Werror=format-security]
  • Loading branch information
Marco van Wieringen committed Mar 27, 2015
1 parent 2b0bb00 commit b886b51
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 2 additions & 0 deletions platforms/packaging/bareos.spec
Expand Up @@ -114,8 +114,10 @@ Vendor: The Bareos Team

%if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 || 0%{?fedora_version} >= 19
%define systemd_support 1
%if 0%{?fedora_version} != 19
%define glusterfs 1
%endif
%endif

%if 0%{?rhel_version} >= 700
%define ceph 1
Expand Down
3 changes: 1 addition & 2 deletions src/qt-tray-monitor/tray-monitor.cpp
Expand Up @@ -62,9 +62,8 @@ static void usage()
#if HAVE_WIN32
QMessageBox::information(0, "Help", out);
#else
fprintf(stderr, out.toUtf8());
fprintf(stderr, "%s", out.toUtf8());
#endif

}

static void parse_command_line(int argc, char* argv[], cl_opts& cl)
Expand Down

0 comments on commit b886b51

Please sign in to comment.