From 1d2f6cc03e6408b7b1b9854da57af4dd8305e15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 21 Sep 2016 17:24:27 +0000 Subject: [PATCH] fix build where java is not installed --- ChangeLog | 15 +++++++++++++++ debian/control.in | 2 +- servicedock.spec.in | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4138f76..af20fd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2016-09-21 09:43 marc + + * debian/control.in, nodejs/makefile.am: fix build problem in + docker + +2016-09-20 22:29 marc + + * COPYING, ChangeLog, INSTALL, doc/screenshot10.png, + doc/screenshot11.png, doc/screenshot12.png, + nodejs/authentication/index.js, nodejs/etc/servicedock.json, + nodejs/etc/systemd, nodejs/etc/systemd/system, + nodejs/etc/systemd/system/servicedock.service, + nodejs/package.json.in, nodejs/servicedock.js, + nodejs/sockets/index.js: ldap authentication works + 2016-09-20 15:00 marc * autogen.sh, ax_cxx_compile_stdcxx_11.m4, diff --git a/debian/control.in b/debian/control.in index e7245b6..adf24ff 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, nodejs, git +Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, nodejs, git, default-jre-headless|default-jre Package: @PACKAGE_NAME@ Section: web diff --git a/servicedock.spec.in b/servicedock.spec.in index 6d97798..afd9a58 100644 --- a/servicedock.spec.in +++ b/servicedock.spec.in @@ -6,7 +6,7 @@ License: LGPL Group: Applications/... Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gnupg, subversion, automake, autoconf, doxygen +BuildRequires: gnupg, subversion, automake, autoconf, doxygen, java %if 0%{?fedora} != 20 BuildRequires: graphviz %endif