From 4a02fd15b5b9cc562c441558ab68fbbac5c67994 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Tue, 5 Nov 2024 03:45:44 +0300
Subject: [PATCH] import augeas-1.14.2-0.1.20240909git2de06e0.el10

---
 .augeas.metadata  |  3 +-
 .gitignore        |  3 +-
 SPECS/augeas.spec | 75 ++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/.augeas.metadata b/.augeas.metadata
index fcd8abb..5070413 100644
--- a/.augeas.metadata
+++ b/.augeas.metadata
@@ -1 +1,2 @@
-88daf08a88fbbdf68ca5865abc5593b52c017368 SOURCES/augeas-1.14.1.tar.gz
+984e0069049e6f405c5cdc3e68fdab15983cf5a5 SOURCES/augeas-2de06e0519bb8daf047191e46a9672e1d16b1955.tar.gz
+1561d68bcc5fd3edcbc2eb95a508f8cba56cde26 SOURCES/gnulib-2f7479a16a.tar.gz
diff --git a/.gitignore b/.gitignore
index 75b4334..b99473c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-SOURCES/augeas-1.14.1.tar.gz
+SOURCES/augeas-2de06e0519bb8daf047191e46a9672e1d16b1955.tar.gz
+SOURCES/gnulib-2f7479a16a.tar.gz
diff --git a/SPECS/augeas.spec b/SPECS/augeas.spec
index ec273ad..767a2b9 100644
--- a/SPECS/augeas.spec
+++ b/SPECS/augeas.spec
@@ -1,24 +1,32 @@
 Name:           augeas
-Version:        1.14.1
-Release:        1%{?dist}
+Version:        1.14.2
 Summary:        A library for changing configuration files
-
 License:        LGPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND Kazlib AND GPL-2.0-or-later AND BSD-2-Clause AND LicenseRef-Fedora-Public-Domain
-URL:            http://augeas.net/
 
-# The website release tarballs were not created for 1.13:
-# http://download.augeas.net/
-Source0:        https://github.com/hercules-team/augeas/releases/download/release-%{version}/%{name}-%{version}.tar.gz
+%global forgeurl https://github.com/hercules-team/%{name}
+%global commit 2de06e0519bb8daf047191e46a9672e1d16b1955
+%forgemeta
+
+Release:        0.1%{?dist}
+URL:            %{forgeurl}
+Source0:        %{forgesource}
 
+# The problem with packaging from the upstream git repo is that we
+# need to provide our own gnulib submodule.  I created this by doing:
+# git archive --format=tar --prefix=.gnulib/ HEAD | gzip -9 > gnulib-2f7479a16a.tar.gz
+Source1:        gnulib-2f7479a16a.tar.gz
 Provides:       bundled(gnulib)
 
+BuildRequires:  autoconf, automake, libtool
 BuildRequires:  make
 BuildRequires:  gcc
+BuildRequires:  flex
+BuildRequires:  bison
 BuildRequires:  readline-devel
 BuildRequires:  libselinux-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  bash-completion
-%if !0%{?rhel}
+%if 0%{?fedora} > 40 || 0%{?rhel} > 10
 BuildRequires:  bash-completion-devel
 %endif
 
@@ -79,7 +87,26 @@ for %{name}.
 
 
 %prep
-%autosetup -p1
+%forgeautosetup -p1
+zcat %{SOURCE1} | tar xf -
+
+# Copied from upstream ./bootstrap:
+modules='argz fnmatch getline getopt-gnu gitlog-to-changelog
+canonicalize-lgpl isblank locale mkstemp regex safe-alloc selinux-h
+stpcpy stpncpy strchrnul strndup sys_wait vasprintf'
+.gnulib/gnulib-tool             \
+  --lgpl=2                      \
+  --with-tests                  \
+  --m4-base=gnulib/m4           \
+  --source-base=gnulib/lib      \
+  --tests-base=gnulib/tests     \
+  --aux-dir=build/ac-aux        \
+  --libtool                     \
+  --quiet                       \
+  --import $modules
+
+autoreconf -fiv
+
 
 %build
 %configure \
@@ -87,7 +114,13 @@ for %{name}.
     --disable-gnulib-tests \
 %endif
     --enable-static
-make %{?_smp_mflags}
+# Disable _smp_mflags because parallel tests fail with the git version
+# because it tries to run lex and yacc in parallel even though lex
+# depends on parser.h from yacc.
+# https://github.com/hercules-team/augeas/issues/572
+#make %%{?_smp_mflags}
+make
+
 
 %check
 # Disable test-preserve.sh SELinux testing. This fails when run under mock due
@@ -96,11 +129,11 @@ export SKIP_TEST_PRESERVE_SELINUX=1
 
 # Tests disabled because gnulib tests fail see:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1674672
-#make %{?_smp_mflags} check || {
-#  echo '===== tests/test-suite.log ====='
-#  cat tests/test-suite.log
-#  exit 1
-#}
+make %{?_smp_mflags} check || {
+  echo '===== tests/test-suite.log ====='
+  cat tests/test-suite.log
+  exit 1
+}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -144,7 +177,7 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
 %{_libdir}/libfa.a
 
 %files bash-completion
-%if !0%{?rhel}
+%if 0%{?fedora} > 40 || 0%{?rhel} > 10
 %dir %{bash_completions_dir}
 %{bash_completions_dir}/augmatch
 %{bash_completions_dir}/augprint
@@ -157,9 +190,17 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
 %endif
 
 %changelog
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.14.1-1
+* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.14.2-0
 - Rebuilt for MSVSphere 10
 
+* Mon Sep 09 2024 Richard W.M. Jones <rjones@redhat.com> - 1.14.2-0
+- Rebase to Fedora Rawhide version
+  resolves: RHEL-55741
+
+* Mon Sep 02 2024 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-2
+- Fix parsing of /etc/fstab
+  resolves: RHEL-55741
+
 * Thu Jul 04 2024 Richard W.M. Jones <rjones@redhat.com> - 1.14.1-1
 - New upstream version 1.14.1
 - Use github tarballs again.