Update to 5.18.4

This commit is contained in:
Miroslav Lichvar 2014-09-02 15:33:33 +02:00
parent 41117fa1ef
commit b27609c70a
4 changed files with 3 additions and 21 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/autogen-5.18.3.tar.xz /autogen-5.18.4.tar.xz

View File

@ -1,15 +0,0 @@
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

View File

@ -1,6 +1,6 @@
Summary: Automated text file generator Summary: Automated text file generator
Name: autogen Name: autogen
Version: 5.18.3 Version: 5.18.4
Release: 3%{?dist} Release: 3%{?dist}
# Some files are licensed under GPLv2+. # Some files are licensed under GPLv2+.
# We redistribute them under GPLv3+. # We redistribute them under GPLv3+.
@ -11,8 +11,6 @@ Source0: ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
# Fix multilib conflicts # Fix multilib conflicts
Patch0: autogen-multilib.patch 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: %{name}-libopts%{?_isa} = %{version}-%{release}
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
@ -58,7 +56,6 @@ This package contains development files for libopts.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .multilib %patch0 -p1 -b .multilib
%patch1 -p1 -b .mktplconfig
# Disable failing test # Disable failing test
sed -i 's|errors.test||' autoopts/test/Makefile.in sed -i 's|errors.test||' autoopts/test/Makefile.in

View File

@ -1 +1 @@
e7e8bb177019771b600f35b124655959 autogen-5.18.3.tar.xz 5171f4a7414adb85b7b25e8438791758 autogen-5.18.4.tar.xz