reintroduce autoreconf in %prep

... and fix a misleading comment in libnice-0.1.14-tests-koji.patch

If autoreconf does not run before the configure script, the subsequent
`make` command runs the configure script once again.  Moreover the build
fails in the fedora-28-x86_64 mock profile because aclocal-1.16 is not
available:

[...]
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
+ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+ make -j8 V=1
CDPATH="${ZSH_VERSION+.}:" && cd . && /bin/sh /builddir/build/BUILD/libnice-0.1.16/missing aclocal-1.16 -I m4
/builddir/build/BUILD/libnice-0.1.16/missing: line 81: aclocal-1.16: command not found
WARNING: 'aclocal-1.16' is missing on your system.
         You should only need it if you modified 'acinclude.m4' or
         'configure.ac' or m4 files included by 'configure.ac'.
         The 'aclocal' program is part of the GNU Automake package:
         <https://www.gnu.org/software/automake>
         It also requires GNU Autoconf, GNU m4 and Perl in order to run:
         <https://www.gnu.org/software/autoconf>
         <https://www.gnu.org/software/m4/>
         <https://www.perl.org/>
make: *** [Makefile:455: aclocal.m4] Error 127
error: Bad exit status from /var/tmp/rpm-tmp.jpPP9q (%build)
This commit is contained in:
Kamil Dudka 2019-05-10 10:10:10 +02:00
parent cf9b3c494c
commit 35231eb713
2 changed files with 10 additions and 2 deletions

View File

@ -3,7 +3,7 @@ From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 9 Feb 2018 19:10:20 +0100 Date: Fri, 9 Feb 2018 19:10:20 +0100
Subject: [PATCH] tests: make the test-suite more verbose Subject: [PATCH] tests: make the test-suite more verbose
... and skip test-gstreamer if user's home is not /builddir (a heuristic ... and skip test-gstreamer if user's home is /builddir (a heuristic
to detect mock) because multicast traffic is blocked on Koji buildhosts. to detect mock) because multicast traffic is blocked on Koji buildhosts.
--- ---
configure.ac | 4 ++-- configure.ac | 4 ++--

View File

@ -3,7 +3,7 @@
Name: libnice Name: libnice
Version: 0.1.16 Version: 0.1.16
Release: 1%{?dist} Release: 2%{?dist}
Summary: GLib ICE implementation Summary: GLib ICE implementation
License: LGPLv2 and MPLv1.1 License: LGPLv2 and MPLv1.1
@ -13,6 +13,8 @@ Source0: https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz
# make tests pass in Koji # make tests pass in Koji
Patch1: libnice-0.1.14-tests-koji.patch Patch1: libnice-0.1.14-tests-koji.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel BuildRequires: glib2-devel
BuildRequires: gnutls-devel >= 2.12.0 BuildRequires: gnutls-devel >= 2.12.0
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
@ -74,6 +76,9 @@ sed -e 's/test-new-dribble/#&/' \
-e 's/test-send-recv/#&/' \ -e 's/test-send-recv/#&/' \
-i tests/Makefile.am -i tests/Makefile.am
# needed for libnice-0.1.14-tests-koji.patch
autoreconf -fiv
%build %build
%configure --enable-compile-warnings=yes --disable-static \ %configure --enable-compile-warnings=yes --disable-static \
@ -133,6 +138,9 @@ make check
%changelog %changelog
* Fri May 10 2019 Kamil Dudka <kdudka@redhat.com> - 0.1.16-2
- reintroduce autoreconf in %%prep
* Fri May 10 2019 Stefan Becker <chemobejk@gmail.com> - 0.1.16-1 * Fri May 10 2019 Stefan Becker <chemobejk@gmail.com> - 0.1.16-1
- Update to 0.1.16 - Update to 0.1.16
- drop all upstream patches - drop all upstream patches