successfully built rpm on fedora 25

ChangeLog

@@ -1,3 +1,9 @@
+2016-10-17 14:06  
+
+	* [r447] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  build-in-docker.sh, debian/changelog.in, debian/control.in:
+	  improved debian changelog
+
 2016-09-28 19:14  
 
 	* [r446] ax_init_standard_project.m4, bootstrap.sh,

ax_init_standard_project.m4

@@ -194,10 +194,13 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(COPYING)
   _AM_SUBST_NOTMAKE([COPYING])
   CHANGELOG=$(<ChangeLog)
-  AX_SUBST(CHANGELOG)
+  AC_SUBST(CHANGELOG)
   _AM_SUBST_NOTMAKE([CHANGELOG])
   DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t  ,}' ChangeLog)
-  AX_SUBST(DEB_CHANGELOG)
+  if test -z "$DEB_CHANGELOG"; then
+    DEB_CHANGELOG="	* see file ChangeLog and project management web site"
+  fi
+  AC_SUBST(DEB_CHANGELOG)
   _AM_SUBST_NOTMAKE([DEB_CHANGELOG])
   AUTHOR=$(head -1 AUTHORS)
   AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
@@ -419,7 +422,7 @@ EOF
 
 # use this in configure.ac to support CppUnit for C++ unit tests
 AC_DEFUN([AX_USE_CPPUNIT], [
-  AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
+  PKG_CHECK_MODULES(CPPUNIT, cppunit, [have_cppunit="yes"], [have_cppunit="no"])
   # infos and warnings
   if test "$have_cppunit" = "no"; then
     AC_MSG_WARN([Missing cppunit development library!
@@ -440,8 +443,23 @@ maintainer-clean-example-targets:
 EOF
 ])
 
-# use this in configure.ac to support C++ examples
+# use this in configure.ac to support NodeJS
 AC_DEFUN([AX_USE_NODEJS], [
+  AC_PATH_PROG(ANDROID, [android], [0],
+                         [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
+  AC_CONFIG_FILES([nodejs/package.json])
+  AC_CONFIG_FILES([nodejs/makefile])
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-nodejs-targets], [nodejs/makefile.in])
+  test -f nodejs/makefile.in && cat >> nodejs/makefile.in <<EOF
+#### Begin: Appended by $0
+maintainer-clean-nodejs-targets:
+	-rm makefile.in
+#### End: $0
+EOF
+])
+
+# use this in configure.ac to support Cordova
+AC_DEFUN([AX_USE_CORDOVA], [
   AC_PATH_PROG(ANDROID, [android], [0],
                          [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
   AC_PATH_PROG(CORDOVA, [cordova], [0],
@@ -454,14 +472,13 @@ AC_DEFUN([AX_USE_NODEJS], [
   fi
   AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
   AX_SUBST(CORDOVA)
-  AC_CONFIG_FILES([nodejs/package.json])
-  AC_CONFIG_FILES([nodejs/makefile])
   AC_CONFIG_FILES([cordova/makefile])
   AC_CONFIG_FILES([cordova/config.xml])
-  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [examples/makefile.in])
+EOF
-  test -f examples/makefile.in && cat >> examples/makefile.in <<EOF
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-cordova-targets], [cordova/makefile.in])
+  test -f cordova/makefile.in && cat >> cordova/makefile.in <<EOF
 #### Begin: Appended by $0
-maintainer-clean-example-targets:
+maintainer-clean-cordova-targets:
 	-rm makefile.in
 #### End: $0
 EOF
@@ -629,7 +646,7 @@ AC_DEFUN([AX_USE_PERLDOC], [
   PERL_SOURCES="m4_default([$1], [perl])"
   AX_SUBST(PERL_SOURCES)
   if test -z "$PERL_SOURCES"; then
-    AC_MSG_ERROR([You must specify the path to per files
+    AC_MSG_ERROR([You must specify the path to perl files
      - use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
   AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
   if test "$have_doxygen" = "no"; then

bootstrap.sh

@@ -149,6 +149,22 @@ GENERATED FILES
     * src/version.cxx - if you enabled AX_USE_CXX
     * html/makefile.am - if you enabled AX_BUILD_HTML
     * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
+    * nodejs/makefile.am - if you add AX_USE_NODEJS
+    * nodejs/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
+    * nodejs/package.json.in - if you add AX_USE_NODEJS
+    * nodejs/etc/${DEFAULT_PROJECT_NAME}.json - if you add AX_USE_NODEJS
+    * nodejs/etc/default/${DEFAULT_PROJECT_NAME} - if you add AX_USE_NODEJS
+    * nodejs/etc/init/${DEFAULT_PROJECT_NAME}.conf - if you add AX_USE_NODEJS
+    * nodejs/etc/systemd/system/${DEFAULT_PROJECT_NAME}.service - if you add AX_USE_NODEJS
+    * nodejs/public - if you add AX_USE_NODEJS
+    * nodejs/public/images - if you add AX_USE_NODEJS
+    * nodejs/public/javascripts/${DEFAULT_PROJECT_NAME}.js - if you add AX_USE_NODEJS
+    * nodejs/public/stylesheets/style.styl - if you add AX_USE_NODEJS
+    * nodejs/routes/index.js - if you add AX_USE_NODEJS
+    * nodejs/sockets/index.js - if you add AX_USE_NODEJS
+    * nodejs/views/index.ejs - if you add AX_USE_NODEJS
+    * nodejs/views/layout.ejs - if you add AX_USE_NODEJS
+    * nodejs/node_modules - if you add AX_USE_NODEJS
     * doc/makefile.am - if you enabled AX_USE_DOXYGEN or AX_USE_PERLDOC
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
     * doc/header.html.in - if you enabled AX_USE_DOXYGEN
@@ -242,6 +258,7 @@ FILES
       * Enable C++: AX_USE_CXX
       * Enable LibTool library creation: AX_USE_LIBTOOL
       * Enable Scripts: AX_USE_SCRIPTS
+      * Enable NodeJS project: AX_USE_NODEJS
       * Enable Doxygen documentation generation: AX_USE_DOXYGEN
       * Enable Perldoc documentation generation: AX_USE_PERLDOC
       * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
@@ -552,6 +569,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_USE_CXX
 #AX_USE_LIBTOOL
 #AX_USE_SCRIPTS
+#AX_USE_NODEJS
 #AX_USE_DOXYGEN
 #AX_USE_PERLDOC
 #AX_USE_DEBIAN_PACKAGING
@@ -839,6 +857,349 @@ ${HEADER}dist_bin_SCRIPTS =
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
+if testtag AX_USE_NODEJS; then
+    checkdir nodejs
+    checkdir nodejs/public
+    checkdir nodejs/public/images
+    checkdir nodejs/etc
+    checkdir nodejs/etc/systemd
+fi
+to --condition AX_USE_NODEJS nodejs/makefile.am <<EOF
+${HEADER}EXTRA_DIST = @PACKAGE_NAME@.js package.json.in public routes sockets views
+
+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
+
+all: node_modules
+
+node_modules: package.json.in
+	HOME=. npm install
+
+clean-local:
+	-rm -r node_modules .npm
+
+install-data-hook:
+	test -d \$(DESTDIR)\${nodejsdir} || mkdir -p \$(DESTDIR)\${nodejsdir}
+	chmod -R u+w \$(DESTDIR)\${nodejsdir}
+	cp -r . \$(DESTDIR)\${nodejsdir}
+
+uninstall-local:
+	-chmod -R u+w \$(DESTDIR)\${nodejsdir}
+	-rm -rf \$(DESTDIR)\${nodejsdir}
+
+MAINTAINERCLEANFILES = makefile.in
+EOF
+to --condition AX_USE_NODEJS nodejs/${PACKAGE_NAME}.js <<EOF
+${CHEADER}try {
+
+  process.on('uncaughtException', function(e) {
+    console.log("**** UNCAUGHT EXCEPTION ****");
+    console.log(e);
+    console.log(e.stack);
+    process.exit(1);
+  });
+  
+  /**
+   * Module dependencies.
+   */
+
+  var express = require('express')
+    , routes = require(__dirname+'/routes');
+
+  var app = module.exports = express.createServer();
+  var io  = require('socket.io').listen(app);
+  var package = require(__dirname+'/package.json');
+  var config = require(package.path.config);
+  var authentication = require(__dirname+'/authentication')(config.restrict);
+  var sockets = require(__dirname+'/sockets')(io, authentication);
+
+  // Configuration
+  process.argv.forEach(function(val, index) {
+    if (index<2) {return}
+    if (index!=2 || isNaN(val)) {
+      console.log("**** ERROR: Unexpected Argument - allowed is only a port number");
+      process.exit(1);
+    }
+    config.port = parseInt(val);
+  });
+  if (typeof config.port != 'number') {
+    console.log("**** WARNING: no valid port given, defaults to 8888");
+    config.port = 8888;
+  }
+
+  app.configure(function(){
+    app.set('views', __dirname + '/views');
+    app.set('view engine', 'ejs');
+    app.use(express.bodyParser());
+    app.use(express.methodOverride());
+    app.use(require('stylus').middleware({ src: __dirname + '/public' }));
+    app.use(app.router);
+    app.use(express.static(__dirname + '/public'));
+  });
+
+  app.configure('development', function(){
+    app.use(express.errorHandler({ dumpExceptions: true, showStack: true }));
+  });
+
+  app.configure('production', function(){
+    app.use(express.errorHandler());
+  });
+
+  // Routes
+  app.get('/', routes.index);
+
+  app.listen(config.port, function() {
+    console.log("Express server listening on port %d in %s mode",
+                app.address().port, app.settings.env);
+  });
+} catch (e) {
+  console.log("**** EXCEPTION ****");
+  console.log(e);
+  console.log(e.stack);
+  process.exit(1);
+}
+EOF
+to --condition AX_USE_NODEJS nodejs/package.json.in <<EOF
+{
+  "name": "@PACKAGE_NAME@",
+  "version": "@PACKAGE_VERSION@",
+  "private": true,
+  "dependencies": {
+    "express": "~2.5.8",
+    "stylus": "~0.53.0",
+    "ejs": ">= 0.0.1",
+    "socket.io": "~1.4.4",
+    "socketio-auth": "0.0.5",
+    "ldapauth": "git+https://github.com/DimensionSoftware/node-ldapauth.git"
+  },
+  "description": "@DESCRIPTION@",
+  "main": "@PACKAGE_NAME@.js",
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "@AUTHOR@",
+  "license": "@LICENSE@",
+  "path": {
+      "prefix": "@PREFIX@",
+      "sysconf": "@SYSCONFDIR@",
+      "pkgdata": "@PKGDATADIR@",
+      "localstate": "@LOCALSTATEDIR@",
+      "log": "@LOCALSTATEDIR@/log/@PACKAGE_NAME@.log",
+      "config":  "@SYSCONFDIR@/@PACKAGE_NAME@.json",
+      "nodejs": "@PKGDATADIR@/nodejs"
+  }
+}
+EOF
+to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
+{
+  "port": 8888,
+  "restrict": {
+    "passwords": {
+      "foo": ["sha256", "fcde2b2edxx56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"]
+    },
+    "ldap": {
+      "url": "ldap://dev.marc.waeckerlin.org",
+      "adminDn": "cn=tmp,ou=system,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "adminPassword": "secret",
+      "searchBase": "ou=person,ou=people,dc=dev,dc=marc,dc=waeckerlin,dc=org",
+      "searchFilter": "(uid={{username}})"
+    }
+  }
+}
+EOF
+to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
+#EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
+#${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME^^}.log"
+#${PACKAGE_NAME^^}="${PACKAGE_NAME}"
+#${PACKAGE_NAME^^}_PORT="8888"
+EOF
+to --condition AX_USE_NODEJS nodejs/etc/init/${PACKAGE_NAME}.conf <<EOF
+#!upstart
+description "$(head -1 README)"
+author      "$(head -1 AUTHORS)"
+
+start on (local-filesystems and net-device-up)
+stop on runlevel [!2345]
+
+respawn
+
+script
+    echo \$\$ > /var/run/${PACKAGE_NAME}.pid
+    # there are some useful defaults
+    # do not edit this file, overwrite values in /etc/default/${PACKAGE_NAME}
+    EXEC_${PACKAGE_NAME^^}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
+    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
+    ${PACKAGE_NAME^^}_USER="${PACKAGE_NAME}"
+    ${PACKAGE_NAME^^}_PORT=""
+    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
+    if test -n "\${${PACKAGE_NAME^^}_USER}"; then
+        exec sudo -u "\${${PACKAGE_NAME^^}_USER}" \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
+    else
+        exec \${EXEC_${PACKAGE_NAME^^}} \${${PACKAGE_NAME^^}_PORT} >> \${${PACKAGE_NAME^^}_LOG} 2>&1
+    fi
+end script
+
+pre-start script
+    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
+    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
+    # Date format same as (new Date()).toISOString() for consistency
+    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Starting" >> \${${PACKAGE_NAME^^}_LOG}
+end script
+
+pre-stop script
+    ${PACKAGE_NAME^^}_LOG="/var/log/${PACKAGE_NAME}.log"
+    [ -r /etc/default/${PACKAGE_NAME} ] && . /etc/default/${PACKAGE_NAME}
+    rm /var/run/${PACKAGE_NAME}.pid
+    echo "[`date -u +%Y-%m-%dT%T.%3NZ`] (sys) Stopping" >> \${${PACKAGE_NAME^^}_LOG}
+end script
+EOF
+to --condition AX_USE_NODEJS nodejs/etc/systemd/system/${PACKAGE_NAME}.service <<EOF
+[Unit]
+Description=$(head -1 README)
+
+[Service]
+ExecStart=/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME} > /var/log/${PACKAGE_NAME}.log
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
+EOF
+to --condition AX_USE_NODEJS nodejs/public/javascripts/${PACKAGE_NAME}.js <<EOF
+${CHEADER}var socket = null;
+function init() {
+  socket = io.connect();
+  /*
+  socket
+    .io
+    .on("connect", connect)
+    .on("reconnect", connect)
+    .on("disconnect", disconnected)
+    .on("error", disconnected);
+  socket
+    .on("authenticated", authenticated)
+    .on("unauthorized", unauthorized)
+    .on("fail", error);
+  */
+}
+
+/// On Load, Call @ref start
+/*
+   \$(window.onbeforeunload = function() {
+   return "Are you sure you want to navigate away?";
+   });
+ */
+\$(init);
+EOF
+to --condition AX_USE_NODEJS nodejs/public/stylesheets/style.styl <<EOF
+body
+  padding: 50px
+  font: 14px "Lucida Grande", Helvetica, Arial, sans-serif
+a
+  color: #00B7FF
+EOF
+to --condition AX_USE_NODEJS nodejs/routes/index.js <<EOF
+${CHEADER}var package = require(__dirname+"/../package.json");
+
+exports.index = function(req, res) {
+  res.render('index', {
+    packagename: package.name,
+    packageversion: package.version
+  });
+};
+EOF
+to --condition AX_USE_NODEJS nodejs/sockets/index.js <<EOF
+module.exports = function(io, authentication) {
+
+  var module={};
+  
+  function broadcast(signal, data) {
+    console.log("<= signal: "+signal);
+    io.sockets.emit(signal, data);
+  }
+  
+  function fail(txt, data) {
+    console.log("** "+txt, data);
+  }
+
+  function connection(socket, userdata) {
+    
+    console.log("=> new connection from "+userdata.username);
+
+    function emit(signal, data, info) {
+      if (typeof data == 'string' && !data.match("\n")) {
+        console.log("<- signal: "+signal+"("+data+")");
+      } else {
+        console.log("<- signal: "+signal);
+      }
+      if (info) console.log(info);
+      socket.emit(signal, data);
+    }
+
+    function fail(txt, data) {
+      console.log("** "+txt, data);
+      emit("fail", txt);
+    }
+
+    /*
+    socket
+      .on("xxx", xxx)
+      .on("yyy", yyy;
+    */
+
+  }
+  
+  // Handle Connection
+  require('socketio-auth')(io, {
+    authenticate: function (socket, data, callback) {
+      console.log("=> authenticate: ", data.username);
+      //get credentials sent by the client
+      var username = data.username;
+      var password = data.password;
+      authentication(data.username, data.password,
+                     function() {
+                       console.log("####LOGIN-SUCESS####");
+                       callback(null, true)
+                     },
+                     function() {
+                       console.log("####LOGIN-FAIL####");
+                       callback(new Error("wrong credentials"))
+                     });
+    },
+    postAuthenticate: connection,
+    timeout: "none"
+  });
+
+  return module;
+}
+EOF
+to --condition AX_USE_NODEJS nodejs/views/index.ejs <<EOF
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width initial-scale=1" />
+    <link href="stylesheets/style.css" rel="stylesheet" type="text/css" />
+    <script type="text/javascript" src="/socket.io/socket.io.js"></script>
+    <script type="text/javascript" src="javascripts/${PACKAGE_NAME}.js"></script>
+    <title>$(head -1 README)</title>
+  </head>
+
+  <body>
+    <h1>$(head -1 README)</h1>
+    <p>generated by bootstrap, please edit</p>
+  </body>
+</html>
+
+EOF
+to --condition AX_USE_NODEJS nodejs/views/layout.ejs <<EOF
+<%- body %>
+EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition 'AX_USE_DOXYGEN|AX_USE_PERLDOC' doc/makefile.am
 if testtag AX_BUILD_TEST; then
     to test/runtests.sh < ${0%/*}/test/runtests.sh
@@ -1102,7 +1463,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @PACKAGER@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_PLANTUML; then echo -n ", default-jre-headless|default-jre"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, default-jre-headless|default-jre, $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -1174,21 +1535,24 @@ fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
+    if testtag AX_USE_CXX; then
+      echo -n ", binutils-devel, gcc-c++"
+    fi
+    if testtag AX_USE_LIBTOOL; then
+      echo -n ", libtool, libtool-ltdl-devel";
+    fi
     if testtag AX_USE_DOXYGEN; then
-      echo -n ", doxygen";
+      echo -n ", doxygen, default-jre-headless";
     fi
     if testtag AX_USE_PERLDOC; then
       echo -n ", libpod-tree-perl";
     fi
-    if testtag AX_USE_PLANTUML; then
-      echo -n ", default-jre-headless";
-    fi
 )
 %if 0%{?fedora} != 20
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 %endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
-BuildRequires: pkgconfig, redhat-lsb$(
+BuildRequires: which, pkgconfig, redhat-lsb$(
     if testtag AX_USE_CPPUNIT; then
       echo -n ", cppunit-devel";
     fi)

build-in-docker.sh

@@ -2,15 +2,20 @@
 set -o errtrace
 
 # build and test everything in a fresh docker installation
-mode="apt"
+myarch=$(dpkg --print-architecture)
+if test "${arch}" = "amd64"; then
+    myarch="amd64|i386"
+fi
+mode="deb"
 img="ubuntu:latest"
 repos=()
 keys=()
-envs=()
+envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm")
-dirs=("-v $(pwd):/workdir")
+dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg:ro")
 packages=()
 targets="all check distcheck"
 commands=()
+arch=$(dpkg --print-architecture)
 wait=0
 if test -e ./build-in-docker.conf; then
     # you can preconfigure the variables in file build-in-docker.conf
@@ -25,8 +30,9 @@ while test $# -gt 0; do
             echo "OPTIONS:"
             echo
             echo "  -h, --help            show this help"
-            echo "  -m, --mode <type>     mode: apt or yum, default: ${mode}"
+            echo "  -m, --mode <type>     mode: deb, rpm, default: ${mode}"
             echo "  -i, --image <image>   use given docker image instead of ${img}"
+            echo "  -a, --arch <arch>     build for given hardware architecture"
             echo "  -t, --targets targets specify build targets, default: ${targets}"
             echo "  -r, --repo <url>      add given apt repository"
             echo "  -k, --key <url>       add public key from url"
@@ -37,6 +43,8 @@ while test $# -gt 0; do
             echo "  -w, --wait            on error keep docker container and wait for enter"
             echo
             echo "  The option -i must be after -m, because mode sets a new default image"
+            echo "  The option -m must be after -t, because mode may be auto detected from targets"
+            echo "  If target is either deb or rpm, mode is set to the same value"
             echo
             echo "  The options -r -k -e -d -p -c can be repeated several times."
             echo
@@ -67,8 +75,10 @@ while test $# -gt 0; do
         (-m|--mode) shift;
             mode="$1"
             case "$mode" in
-                (apt) img="ubuntu:latest";;
+                (deb|apt) img="ubuntu:latest";;
+                (rpm|zypper) img="opensuse:latest";;
                 (yum) img="centos:latest";;
+                (dnf) img="fedora:latest";;
                 (*)
                     echo "**** ERROR: unknown mode '$1', try --help" 1>&2
                     exit 1
@@ -78,8 +88,16 @@ while test $# -gt 0; do
         (-i|--image) shift;
             img="$1"
             ;;
-        (-t|--targets) shift;
+        (-a|--arch) shift;
+            arch="$1"
+            ;;
+        (-t|--targets) shift
             targets="$1"
+            if test "$1" = "deb" -o "$1" = "rpm"; then
+                # set mode to same value
+                set -- "-m" $@
+                continue
+            fi
             ;;
         (-r|--repo) shift;
             repos+=("$1")
@@ -183,10 +201,20 @@ function ifthenelse() {
 set -x
 
 docker pull $img
-DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
+DOCKER_ID=$(docker create ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
+if ! [[ $arch =~ $myarch ]]; then
+    docker cp "/usr/bin/qemu-${arch}-static" "${DOCKER_ID}:/usr/bin/qemu-${arch}-static"
+fi
+docker start "${DOCKER_ID}"
+if docker exec ${DOCKER_ID} getent passwd > /dev/null 2>&1; then
+    docker exec ${DOCKER_ID} groupadd -g $(id -g) build
+    docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
+else
+    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -u) -d"${HOME}" build
+fi
 case $mode in
-    (apt)
+    (deb|apt)
         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
@@ -214,23 +242,8 @@ case $mode in
         done
         docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
         ;;
-    (yum)
+    (rpm|yum|dnf|zypper)
         ./bootstrap.sh -t dist
-        if [[ "$img" =~ "centos" ]]; then
-            docker exec ${DOCKER_ID} yum install -y redhat-lsb
-            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
-[WandiscoSVN]
-name=Wandisco SVN Repo
-EOF
-            docker exec -i ${DOCKER_ID} bash -c 'echo "baseurl=http://opensource.wandisco.com/centos/$(lsb_release -sr | sed '"'"'s,[^0-9].*,,'"'"')/svn-'$(svn --version | head -1 | sed 's,[^0-9]*\([0-9]\+\.[0-9]\+\).*,\1,')'/RPMS/$(uname -i)/" >> /etc/yum.repos.d/wandisco-svn.repo'
-            docker exec -i ${DOCKER_ID} bash -c 'cat >> /etc/yum.repos.d/wandisco-svn.repo' <<EOF
-enabled=1
-gpgcheck=0
-EOF
-        fi
-        docker exec ${DOCKER_ID} yum install -y rpm-build 
-        docker exec ${DOCKER_ID} groupadd -g $(id -g) build
-        docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
         docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
         ;;
 esac

mrw-c++.spec.in

@@ -5,13 +5,13 @@ Release: @BUILD_NUMBER@%{?dist}
 License: LGPL
 Group: Development/Libraries/C++
 Source0: %{name}-%{version}.tar.gz
-BuildRequires: subversion, automake, autoconf, doxygen
+BuildRequires: rpm-build subversion, automake, autoconf, doxygen, libtool, libtool-ltdl-devel, binutils-devel, gcc-c++
 %if 0%{?fedora} != 20
 BuildRequires: graphviz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
-BuildRequires: pkgconfig, cppunit-devel, redhat-lsb
+BuildRequires: which, pkgconfig, cppunit-devel, redhat-lsb
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 BuildRequires: mscgen
 %endif

resolve-rpmbuilddeps.sh

@@ -10,35 +10,21 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+INSTALL_TOOL=${INSTALL_TOOL:-$((est -x /usr/bin/zypper && echo zypper) ||  (test -x /usr/bin/dnf && echo dnf) || (test -x /usr/bin/yum && echo yum))}
 SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
-PKGCONFIGS="${2:-epel-release}" # packages to configure yum
 
 if test -n "${SCHROOTNAME}"; then
+    schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  install -y rpm-build
     FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
-        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL}  install -y ${FILES}
-        if test -n "${FIRST}"; then
-            schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FIRST} || \
-                schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FIRST} || \
-                schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FIRST}
-        fi
-        schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \
-            schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \
-            schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES}
     fi
 else
+    ${INSTALL_TOOL} install -y rpm-build
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
-        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        ${INSTALL_TOOL} install -y ${FILES}
-        if test -n "${FIRST}"; then
-            yum install -y ${FIRST} || \
-                zypper install -y ${FIRST} || \
-                dnf install -y ${FIRST}
-        fi
-        yum install -y ${FILES} || \
-            zypper install -y ${FILES} || \
-            dnf install -y ${FILES}
     fi
 fi