From 35231eb713276f68692f2bd1296b1f57772b4967 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Fri, 10 May 2019 10:10:10 +0200 Subject: [PATCH] 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: It also requires GNU Autoconf, GNU m4 and Perl in order to run: make: *** [Makefile:455: aclocal.m4] Error 127 error: Bad exit status from /var/tmp/rpm-tmp.jpPP9q (%build) --- libnice-0.1.14-tests-koji.patch | 2 +- libnice.spec | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libnice-0.1.14-tests-koji.patch b/libnice-0.1.14-tests-koji.patch index 997e712..96f0c9b 100644 --- a/libnice-0.1.14-tests-koji.patch +++ b/libnice-0.1.14-tests-koji.patch @@ -3,7 +3,7 @@ From: Kamil Dudka Date: Fri, 9 Feb 2018 19:10:20 +0100 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. --- configure.ac | 4 ++-- diff --git a/libnice.spec b/libnice.spec index 8fc97ed..dda57b7 100644 --- a/libnice.spec +++ b/libnice.spec @@ -3,7 +3,7 @@ Name: libnice Version: 0.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GLib ICE implementation License: LGPLv2 and MPLv1.1 @@ -13,6 +13,8 @@ Source0: https://nice.freedesktop.org/releases/%{name}-%{version}.tar.gz # make tests pass in Koji Patch1: libnice-0.1.14-tests-koji.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: glib2-devel BuildRequires: gnutls-devel >= 2.12.0 BuildRequires: gobject-introspection-devel @@ -74,6 +76,9 @@ sed -e 's/test-new-dribble/#&/' \ -e 's/test-send-recv/#&/' \ -i tests/Makefile.am +# needed for libnice-0.1.14-tests-koji.patch +autoreconf -fiv + %build %configure --enable-compile-warnings=yes --disable-static \ @@ -133,6 +138,9 @@ make check %changelog +* Fri May 10 2019 Kamil Dudka - 0.1.16-2 +- reintroduce autoreconf in %%prep + * Fri May 10 2019 Stefan Becker - 0.1.16-1 - Update to 0.1.16 - drop all upstream patches