fix project logo in doxygen; allow to add repositories in rpm build

scripts/bootstrap.sh

@@ -31,8 +31,9 @@ while test $# -gt 0; do
         (--configure|-c) configure=1;;
         (--docker|-d) docker=1;;
         (--build|-b) configure=1; build=1; buildtarget+=" distcheck";;
-        (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";;
+        (--all|-a) shift; configure=1; build=1; buildtarget+=" all";;
         (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";;
+        (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";;
         (--overwrite|-o) overwrite=1;;
         (--rebuild|-r) rebuild=1;;
         (--rebuild-file|-f) shift; rebuildfiles+=("$1");;
@@ -51,6 +52,8 @@ OPTIONS
   --configure, -c            call ./configure after initialization
   --docker, -d               build and run tests in a docker instance
   --build, -b                build, also call ./configure && make distcheck
+  --all, -a                  same as -b, but make target all
+  --clean                    same as -b, but make target maintainer-clean
   --target, -t <target>      same as -b, but specify target instead of distcheck
   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
   --rebuild, -r              force rebuild of generated files, even if modified

scripts/resolve-rpmbuilddeps.sh

@@ -12,10 +12,17 @@
 
 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
     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// /|}")
+        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}
@@ -23,6 +30,12 @@ if test -n "${SCHROOTNAME}"; then
 else
     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// /|}")
+        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}