Add macro updates for autoconf-2.71 and downstream gating
This commit is contained in:
parent
54a1f3a35f
commit
c2d6ef0b1a
84
0001-configure-update-some-macros-for-autoconf-2.71.patch
Normal file
84
0001-configure-update-some-macros-for-autoconf-2.71.patch
Normal file
@ -0,0 +1,84 @@
|
||||
From a8492d71a6db8565544444eef11de8c733c95ef8 Mon Sep 17 00:00:00 2001
|
||||
From: Sumit Bose <sbose@redhat.com>
|
||||
Date: Tue, 6 Apr 2021 19:32:07 +0200
|
||||
Subject: [PATCH] configure: update some macros for autoconf-2.71
|
||||
|
||||
---
|
||||
configure.ac | 10 +++++-----
|
||||
library/Makefile.am | 2 +-
|
||||
tools/Makefile.am | 2 +-
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7dfba97..c6ff31d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1,4 +1,4 @@
|
||||
-AC_PREREQ(2.61)
|
||||
+AC_PREREQ([2.61])
|
||||
|
||||
AC_INIT([adcli],
|
||||
[0.9.1],
|
||||
@@ -33,7 +33,7 @@ LT_INIT([dlopen disable-static])
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AM_PROG_CC_C_O
|
||||
-AM_PROG_LIBTOOL
|
||||
+LT_INIT
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Kerberos
|
||||
@@ -143,7 +143,7 @@ AC_ARG_WITH([vendor-error-message],
|
||||
|
||||
AC_MSG_CHECKING([whether to build documentation])
|
||||
AC_ARG_ENABLE(doc,
|
||||
- AC_HELP_STRING([--enable-doc],
|
||||
+ AS_HELP_STRING([--enable-doc],
|
||||
[Disable building documentation])
|
||||
)
|
||||
|
||||
@@ -180,7 +180,7 @@ doc_status=$enable_doc
|
||||
|
||||
AC_MSG_CHECKING([for debug mode])
|
||||
AC_ARG_ENABLE(debug,
|
||||
- AC_HELP_STRING([--enable-debug=no/default/yes],
|
||||
+ AS_HELP_STRING([--enable-debug=no/default/yes],
|
||||
[Turn on or off debugging]))
|
||||
|
||||
if test "$enable_debug" != "no"; then
|
||||
@@ -308,7 +308,7 @@ fi
|
||||
|
||||
AC_MSG_CHECKING([where is Samba's net utility])
|
||||
AC_ARG_WITH([samba_data_tool],
|
||||
- AC_HELP_STRING([--with-samba-data-tool=/path],
|
||||
+ AS_HELP_STRING([--with-samba-data-tool=/path],
|
||||
[Path to Samba's net utility]),
|
||||
[],
|
||||
[with_samba_data_tool=/usr/bin/net])
|
||||
diff --git a/library/Makefile.am b/library/Makefile.am
|
||||
index 4829555..e046606 100644
|
||||
--- a/library/Makefile.am
|
||||
+++ b/library/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-DADCLI_UNSTABLE_API \
|
||||
-DHOST_TRIPLET=\"$(host_triplet)\" \
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 1cdf451..71ec14d 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/Makefile.decl
|
||||
|
||||
-INCLUDES = \
|
||||
+AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/library \
|
||||
-DKRB5_CONFIG=\""$(sysconfdir)/krb5.conf"\" \
|
||||
--
|
||||
2.30.2
|
||||
|
@ -1,12 +1,13 @@
|
||||
Name: adcli
|
||||
Version: 0.9.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Active Directory enrollment
|
||||
License: LGPLv2+
|
||||
URL: https://gitlab.freedesktop.org/realmd/adcli
|
||||
Source0: https://gitlab.freedesktop.org/sbose/adcli/uploads/30880d967e79cee789194435e70fbf30/adcli-%{version}.tar.gz
|
||||
|
||||
Patch1: 0001-build-add-with-vendor-error-message-configure-option.patch
|
||||
Patch2: 0001-configure-update-some-macros-for-autoconf-2.71.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: intltool pkgconfig
|
||||
@ -71,6 +72,9 @@ documentation.
|
||||
%doc %{_datadir}/doc/adcli/*
|
||||
|
||||
%changelog
|
||||
* Wed Apr 07 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-4
|
||||
- Add macro updates for autoconf-2.71 and downstream gating
|
||||
|
||||
* Mon Mar 29 2021 Sumit Bose <sbose@redhat.com> - 0.9.1-3
|
||||
- Add vendor error message
|
||||
Resolves: rhbz#1889386
|
||||
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
Loading…
Reference in New Issue
Block a user