rpm builds tested

This commit is contained in:
Marc Wäckerlin
2016-12-19 19:47:26 +00:00
parent cd1568c93f
commit e9508f240c
9 changed files with 40 additions and 13 deletions

View File

@@ -302,7 +302,7 @@ VCSDEPENDS=""
if test -d .svn; then
VCS="svn"
VCSDEPENDS_DEB="svn2cl, subversion, subversion-tools,"
VCSDEPENDS_RPM="subversion, subversion-tools,"
VCSDEPENDS_RPM="subversion,"
echo -e " \e[32msuccess\e[0m detected ${VCS}"
elif test -d .git; then
VCS="git"
@@ -1625,6 +1625,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 +1637,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

View File

@@ -227,6 +227,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
case $mode in
(deb|apt)
if [[ "${img}" =~ "ubuntu" ]]; then

View File

@@ -8,6 +8,11 @@
## 1 2 3 4 5 6 7 8
## 45678901234567890123456789012345678901234567890123456789012345678901234567890
dist_bin_SCRIPTS =
pkgdocdatadir = ${pkgdatadir}/doc
pkgtestdatadir = ${pkgdatadir}/test
dist_pkgdata_DATA = ax_check_qt.m4 bootstrap.sh mac-create-app-bundle.sh makefile_test.inc.am ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh resolve-debbuilddeps.sh build-resource-file.sh resolve-rpmbuilddeps.sh ax_init_standard_project.m4 sql-to-dot.sed
dist_pkgdocdata_DATA = doc/plantuml.jar
dist_pkgtestdata_DATA = test/runtests.sh
MAINTAINERCLEANFILES = makefile.in