From e9508f240cd601ee6cf3d48a123cdd13acf2cc10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 19 Dec 2016 19:47:26 +0000 Subject: [PATCH] rpm builds tested --- COPYING | 2 +- ChangeLog | 12 ++++++++++++ INSTALL | 2 +- bootstrap-build-environment.spec.in | 21 ++++++++++++++------- bootstrap.sh | 2 +- build-in-docker.sh | 1 + scripts/bootstrap.sh | 5 +++-- scripts/build-in-docker.sh | 1 + scripts/makefile.am | 7 ++++++- 9 files changed, 40 insertions(+), 13 deletions(-) diff --git a/COPYING b/COPYING index 88798ab..2fcb217 120000 --- a/COPYING +++ b/COPYING @@ -1 +1 @@ -/usr/share/automake-1.15/COPYING \ No newline at end of file +/usr/share/automake-1.13/COPYING \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index bc9a547..2fba5aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2016-12-19 18:29 + + * [r123] debian/changelog.in: + updated build system + +2016-12-19 18:06 + + * [r122] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.conf, build-in-docker.sh, + resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh: + updated build system + 2016-12-12 14:13 * [r121] scripts/build-in-docker.sh: diff --git a/INSTALL b/INSTALL index ddcdb76..8b641e3 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.15/INSTALL \ No newline at end of file +/usr/share/automake-1.13/INSTALL \ No newline at end of file diff --git a/bootstrap-build-environment.spec.in b/bootstrap-build-environment.spec.in index 4a3e174..a8e8ccf 100644 --- a/bootstrap-build-environment.spec.in +++ b/bootstrap-build-environment.spec.in @@ -6,12 +6,20 @@ License: LGPL Group: Applications/... Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gnupg, subversion, automake, autoconf, doxygen +BuildRequires: gnupg, subversion, make, automake, autoconf, rpm-build, doxygen, java-openjdk %if 0%{?fedora} != 20 BuildRequires: graphviz %endif -%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} -BuildRequires: pkgconfig, redhat-lsb +%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia} +BuildRequires: which, pkgconfig +%if 0%{?rhel} > 6 || 0%{?rhl} > 6 || 0%{?centos} > 6 || 0%{?fedora} || 0%{?mageia} +BuildRequires: rpm-sign +%endif +%if 0%{?mageia} +BuildRequires: gnupg, lsb-release +%else +BuildRequires: gpg, redhat-lsb +%endif %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} ) BuildRequires: mscgen @@ -30,8 +38,7 @@ BuildRequires: pkg-config, lsb-release %description @README@ - - +%global debug_package %{nil} %prep %setup -q ./configure --prefix=/usr \ @@ -50,9 +57,9 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -/usr/bin/* +/usr/share/@PACKAGE_NAME@/* %doc -/usr/share/* +/usr/share/doc/packages/@PACKAGE_NAME@/* diff --git a/bootstrap.sh b/bootstrap.sh index 0afedc3..aee62fa 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -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" diff --git a/build-in-docker.sh b/build-in-docker.sh index 7bd8ac6..44fd130 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -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 diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index c59fc55..f7be988 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -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 < /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 diff --git a/scripts/makefile.am b/scripts/makefile.am index b93dc24..c47edfe 100644 --- a/scripts/makefile.am +++ b/scripts/makefile.am @@ -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