Update to 5.18.3
This commit is contained in:
parent
54f1b19837
commit
22bacfe8fd
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/autogen-5.18.2.tar.xz
|
||||
/autogen-5.18.3.tar.xz
|
||||
|
15
autogen-mktplconfig.patch
Normal file
15
autogen-mktplconfig.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -up autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig autogen-5.18.3/autoopts/mk-tpl-config.sh
|
||||
--- autogen-5.18.3/autoopts/mk-tpl-config.sh.mktplconfig 2014-05-10 17:48:26.000000000 +0200
|
||||
+++ autogen-5.18.3/autoopts/mk-tpl-config.sh 2014-05-27 14:05:26.961175451 +0200
|
||||
@@ -200,9 +200,8 @@ fix_guile() {
|
||||
cd ${builddir}
|
||||
find_libguiledir "${LGCFLAGS}"
|
||||
|
||||
- list=`set +e ; exec 2>/dev/null
|
||||
- find ${libguiledir}/libguile* -type f | \
|
||||
- xargs grep -l -E '\<noreturn\>'`
|
||||
+ list=`find ${libguiledir}/libguile* -type f | \
|
||||
+ xargs grep -l -E '\<noreturn\>' 2> /dev/null || :`
|
||||
|
||||
test -z "$list" && exit 0
|
||||
|
@ -1,6 +1,6 @@
|
||||
Summary: Automated text file generator
|
||||
Name: autogen
|
||||
Version: 5.18.2
|
||||
Version: 5.18.3
|
||||
Release: 2%{?dist}
|
||||
# Some files are licensed under GPLv2+.
|
||||
# We redistribute them under GPLv3+.
|
||||
@ -11,6 +11,8 @@ Source0: ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
|
||||
|
||||
# Fix multilib conflicts
|
||||
Patch0: autogen-multilib.patch
|
||||
# Fix mk-tpl-config.sh to not fail when guile headers don't use noreturn
|
||||
Patch1: autogen-mktplconfig.patch
|
||||
|
||||
Requires: %{name}-libopts%{?_isa} = %{version}-%{release}
|
||||
Requires(post): /sbin/install-info
|
||||
@ -56,6 +58,7 @@ This package contains development files for libopts.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .multilib
|
||||
%patch1 -p1 -b .mktplconfig
|
||||
|
||||
# Disable failing test
|
||||
sed -i 's|errors.test||' autoopts/test/Makefile.in
|
||||
|
Loading…
Reference in New Issue
Block a user