diff --git a/ChangeLog b/ChangeLog index 2fba5aa..7dcd9ba 100644 --- a/ChangeLog +++ b/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: diff --git a/bootstrap.sh b/bootstrap.sh index aee62fa..cff28bc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -873,9 +873,9 @@ nodejsdir = \${pkgdatadir}/nodejs sysconfdefaultdir = \${sysconfdir}/default sysconfinitdir = \${sysconfdir}/init -dist_sysconf_DATA = etc/@PACKAGE_NAME@.json -dist_sysconfdefault_DATA = etc/default/@PACKAGE_NAME@ -dist_sysconfinit_DATA = etc/init/@PACKAGE_NAME@.conf +dist_sysconf_DATA = \${sysconfdir}/@PACKAGE_NAME@.json +dist_sysconfdefault_DATA = \${sysconfdir}/default/@PACKAGE_NAME@ +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 < /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 diff --git a/debian/control.in b/debian/control.in index 3ac8f94..8681209 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 +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 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 55bdde8..e738ab6 100755 --- a/scripts/bootstrap.sh +++ b/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 \\ diff --git a/scripts/build-in-docker.sh b/scripts/build-in-docker.sh index bd4e3b6..d426c9e 100755 --- a/scripts/build-in-docker.sh +++ b/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") -dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg") +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}/.gnupg") packages=() targets="all check distcheck" commands=()