From 8121a99511832ed74dbef53e18d02b4989dde457 Mon Sep 17 00:00:00 2001 From: cherry530 Date: Wed, 12 Jan 2022 18:49:52 +0800 Subject: [PATCH] fix AM_INIT_AUTOMAKE expanded multiple times Signed-off-by: cherry530 (cherry picked from commit 45c6472c050c235e9dec58386d50d3453e6f9c10) --- librelp.spec | 6 +++++- remove-AM_INIT_AUTOMAKE.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 remove-AM_INIT_AUTOMAKE.patch diff --git a/librelp.spec b/librelp.spec index bc654bd..2083dba 100644 --- a/librelp.spec +++ b/librelp.spec @@ -1,11 +1,12 @@ Name: librelp Version: 1.2.16 -Release: 3 +Release: 4 Summary: An Easy To Use Library For The RELP Protocol License: GPLv3+ URL: http://www.rsyslog.com/ Source0: http://download.rsyslog.com/librelp/%{name}-%{version}.tar.gz Patch0001: librelp-1.2.13-crypto-compliance.patch +Patch0002: remove-AM_INIT_AUTOMAKE.patch Requires(post): glibc Requires(postun): glibc BuildRequires: gnutls-devel >= 1.4.0 @@ -51,5 +52,8 @@ autoreconf -ivf %{_libdir}/pkgconfig/relp.pc %changelog +* Wed Jan 12 2021 xu_ping - 1.2.16-4 +- remove AM_INIT_AUTOMAKE to fix AM_INIT_AUTOMAKE expanded multiple times + * Wed Nov 27 2019 gulining - 1.2.16-3 - Pakcage init diff --git a/remove-AM_INIT_AUTOMAKE.patch b/remove-AM_INIT_AUTOMAKE.patch new file mode 100644 index 0000000..2d50a44 --- /dev/null +++ b/remove-AM_INIT_AUTOMAKE.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index ede924d..0e38421 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4,7 +4,6 @@ + AC_PREREQ(2.61) + AC_INIT([librelp], [1.2.16], [rgerhards@adiscon.com]) + AM_INIT_AUTOMAKE +-AM_INIT_AUTOMAKE + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_CONFIG_SRCDIR([src/relp.c]) + AC_CONFIG_HEADER([config.h]) -- Gitee