diff --git a/ChangeLog b/ChangeLog index 6e4402b..e582a78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2016-12-07 15:59 + + * [r450] bootstrap.sh, build-in-docker.sh, configure.ac, + mrw-c++.spec.in, resolve-rpmbuilddeps.sh: + build improved for fedora, centos, opensuse + +2016-12-07 12:35 + + * [r449] bootstrap.sh, build-in-docker.sh, resolve-rpmbuilddeps.sh: + improved build, so that build in docker does not depend on the + hosting system + +2016-12-07 10:27 + + * [r448] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.sh, mrw-c++.spec.in, resolve-rpmbuilddeps.sh: + successfully built rpm on fedora 25 + 2016-10-17 14:06 * [r447] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, diff --git a/bootstrap.sh b/bootstrap.sh index 467db61..e5dbae0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1463,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, 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)" + BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release, fakeroot, $(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 <&1 | sed -n 's, is needed by.*,,p') if test -n "${FILES}"; then schroot -c ${SCHROOTNAME} -u root -- ${INSTALL_TOOL} install -y ${FILES} fi else - ${INSTALL_TOOL} install -y rpm-build automake libtool subversion gcc-c++ pkgconfig - ./bootstrap.sh -c 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 ${INSTALL_TOOL} install -y ${FILES}