development/bootstrap-build-environment
1
0
Fork 0
Code Issues Pull Requests Releases Activity

rpm builds tested

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@@ -1 +1 @@
/usr/share/automake-1.15/COPYING
/usr/share/automake-1.13/COPYING

12
ChangeLog
View File

@@ -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:

2
INSTALL
View File

@@ -1 +1 @@
/usr/share/automake-1.15/INSTALL
/usr/share/automake-1.13/INSTALL

21
bootstrap-build-environment.spec.in
View File

@@ -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@/*

2
bootstrap.sh
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"

1
build-in-docker.sh
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

5
scripts/bootstrap.sh
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

1
scripts/build-in-docker.sh
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

7
scripts/makefile.am
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