diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-05-19 09:25:34 +0200 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-05-21 22:21:49 -0700 |
| commit | 79de5b63775f1ab8e2e498fd51b55509a30cd896 (patch) | |
| tree | d5f11ada8dbb389f01711b05eb2530490e17b6a7 /glusterfs.spec.in | |
| parent | 0a77eb1e4576d8722b27a42c98879cc7250e00fe (diff) | |
tests/rpm: always run ./autogen.sh to create missing files
In some occasions 'install-sh' seems to be missing in the 'make dist'
tarball when ./autogen.sh has not been run (skipped when 'configure'
exists). With this changes, 'autogen.sh' is always run so that missing
files should get added to the tarball.
Also write the logs from mock to a known location, and copy them to the
'/var/log/' directory that Jenkins archives after a regression test
failure. This makes it easier to find build issues that mock detects.
Change-Id: I8d0cf1afef61ebab0137aa0d20521e75a35ddbdd
BUG: 1038391
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/7786
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 6d67a93a338..ca9b2faa4c9 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -473,7 +473,9 @@ This package provides the glusterfs server daemon. %setup -q -n %{name}-%{version}%{?prereltag} %build -./autogen.sh +# For whatever reason, install-sh is sometimes missing. When this gets fixed, +# there is no need to run ./autogen or have a BuildRequires for automake. +[ -e 'install-sh' -o -e 'install.sh' ] || ./autogen.sh %configure \ %{?_without_rdma} \ %{?_without_epoll} \ @@ -1011,6 +1013,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Tue May 20 2014 Niels de Vos <ndevos@redhat.com> +- Almost drop calling ./autogen.sh + * Fri Apr 25 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com> - Sync with Fedora spec (#1091408, #1091392) |