fix build where java is not installed

8 years ago · 1d2f6cc03e
parent 17cd39e4e5
commit 1d2f6cc03e
3 changed files with 17 additions and 2 deletions
--- a/15
+++ b/15
@ -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,
--- 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
--- 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