fixed rpm and deb build

ChangeLog

@@ -1,3 +1,17 @@
+2016-12-23 14:48  
+
+	* [r125] build-in-docker.sh, scripts/bootstrap.sh,
+	  scripts/build-in-docker.sh:
+	  bugfixes
+
+2016-12-19 19:47  
+
+	* [r124] COPYING, ChangeLog, INSTALL,
+	  bootstrap-build-environment.spec.in, bootstrap.sh,
+	  build-in-docker.sh, scripts/bootstrap.sh,
+	  scripts/build-in-docker.sh, scripts/makefile.am:
+	  rpm builds tested
+
 2016-12-19 18:29  
 
 	* [r123] debian/changelog.in:

bootstrap.sh

@@ -873,9 +873,9 @@ nodejsdir = \${pkgdatadir}/nodejs
 
 sysconfdefaultdir = \${sysconfdir}/default
 sysconfinitdir = \${sysconfdir}/init
-dist_sysconf_DATA = etc/@PACKAGE_NAME@.json
+dist_sysconf_DATA = \${sysconfdir}/@PACKAGE_NAME@.json
-dist_sysconfdefault_DATA = etc/default/@PACKAGE_NAME@
+dist_sysconfdefault_DATA = \${sysconfdir}/default/@PACKAGE_NAME@
-dist_sysconfinit_DATA = etc/init/@PACKAGE_NAME@.conf
+dist_sysconfinit_DATA = \${sysconfdir}/init/@PACKAGE_NAME@.conf
 
 all: node_modules
 
@@ -1600,7 +1600,9 @@ echo
 echo This package contains only the shared libraries required at runtime.
 fi)
 
-
+$(if ! testtag 'AX_USE_LIBTOOL|AX_USE_CXX'; then
+  echo '%global debug_package %{nil}'
+fi)
 %prep
 %setup -q
 ./configure --prefix=/usr \\
@@ -1625,6 +1627,7 @@ else
 echo '/usr/bin/*'
 echo '/usr/share/applications/*'
 fi)
+/usr/share/@PACKAGE_NAME@
 %doc
 $(if testtag AX_USE_LIBTOOL; then
   cat <<EOF2
@@ -1636,7 +1639,7 @@ $(if testtag AX_USE_LIBTOOL; then
 /usr/share/doc/packages/@PACKAGE_NAME@/README
 EOF2
 else
-  echo '/usr/share/*'
+  echo '/usr/share/doc/packages/@PACKAGE_NAME@'
 fi)
 
 $(if testtag AX_USE_LIBTOOL; then

build-in-docker.sh

@@ -24,6 +24,7 @@ if test -e ./build-in-docker.conf; then
     # if you do so, add the file to EXTRA_DIST in makefile.am
     source ./build-in-docker.conf
 fi
+
 while test $# -gt 0; do
     case "$1" in
         (-h|--help)
@@ -113,6 +114,7 @@ while test $# -gt 0; do
             flags+=("$1")
             ;;
         (-r|--repo) shift;
+            echo "OPTION: $1"
             repos+=("$1")
             ;;
         (-k|--key) shift;
@@ -227,7 +229,7 @@ fi
 if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
-docker exec ${DOCKER_ID} chown -R  $(id -u).$(id -g) "${HOME}" /workdir
+docker exec ${DOCKER_ID} chown $(id -u):$(id -g) "${HOME}"
 case $mode in
     (deb|apt)
         if [[ "${img}" =~ "ubuntu" ]]; then
@@ -284,7 +286,7 @@ EOF
         done
         for repo in "${repos[@]}"; do
             INSTALL_REPO=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper ar) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf config-manager --add-repo) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo wget -O/etc/yum.repos.d/additional$i.repo) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo true))
-            ifthenelse "${repo}" "${INSTALL_REPO} ARG"
+            ifthenelse "${repo}" "${INSTALL_REPO} 'ARG'"
             ((++i))
         done
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh

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
+Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, default-jre-headless|default-jre
 
 Package: @PACKAGE_NAME@
 Section: development

scripts/bootstrap.sh

@@ -1600,7 +1600,9 @@ echo
 echo This package contains only the shared libraries required at runtime.
 fi)
 
-
+$(if ! testtag 'AX_USE_LIBTOOL|AX_USE_CXX'; then
+  echo '%global debug_package %{nil}'
+fi)
 %prep
 %setup -q
 ./configure --prefix=/usr \\

scripts/build-in-docker.sh

@@ -10,8 +10,8 @@ mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=("-e LANG=${LANG}" "-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
+envs=("-e LANG=${LANG}" "-e HOME=${HOME}" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
-dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:${HOME}/.gnupg")
 packages=()
 targets="all check distcheck"
 commands=()