Rebase to Fedora Rawhide version
resolves: RHEL-55741
This commit is contained in:
Richard W.M. Jones
parent
447b5fa869
commit
b59d5ebacc
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/.build-*.log
|
||||
/augeas-*.tar.gz
|
||||
/gnulib-*.tar.gz
|
||||
/clog
|
||||
|
||||
71
augeas.spec
71
augeas.spec
@ -1,28 +1,32 @@
|
||||
Name: augeas
|
||||
Version: 1.14.1
|
||||
Release: 2%{?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
|
||||
|
||||
# Fix parsing of /etc/fstab
|
||||
# Upstream commit 5246ef07381033a9b20426370156dae9f8f97a2c
|
||||
Patch: 0001-lenses-fstab.aug-Allow-comma-after-the-last-option-8.patch
|
||||
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
|
||||
|
||||
@ -83,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 \
|
||||
@ -91,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
|
||||
@ -100,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
|
||||
@ -148,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
|
||||
@ -161,6 +190,10 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
3
sources
3
sources
@ -1 +1,2 @@
|
||||
SHA512 (augeas-1.14.1.tar.gz) = fddb2e243f979e71fc09f9d45d569d6307b35485b2d885bf7bcbc032ba5617fe7ab2071a041422c3efe2dd62eda74aba41016d248c0636e947d4f1c9144375aa
|
||||
SHA512 (augeas-2de06e0519bb8daf047191e46a9672e1d16b1955.tar.gz) = 9ebd2b6d55b71561567d170fcc4532ea259ec33c0dd8e1386a0687861c5e4d50b512d1760f4586ac2e5a2ee968b157db6eae91cd6322cd1f7d71b8a5efef12d7
|
||||
SHA512 (gnulib-2f7479a16a.tar.gz) = 59aa31b534dcf15c816296699c625bf60e90a108091f09709ef9341707821fb407c22167cf489aa44ee5b62cf3f44aa75892cfbaa078056dfbd9728847fe83ee
|
||||
|
||||
Loading…
Reference in New Issue
Block a user