Include verify.h in libopts tear-off tarball (#1400907)

This commit is contained in:
Miroslav Lichvar 2017-03-07 12:03:23 +01:00
parent 70fde16b87
commit 58afbcd5a7
2 changed files with 15 additions and 0 deletions

12
autogen-verifyh.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up autogen-5.18.12/pkg/libopts/mklibsrc.sh.verifyh autogen-5.18.12/pkg/libopts/mklibsrc.sh
--- autogen-5.18.12/pkg/libopts/mklibsrc.sh.verifyh 2015-10-03 19:39:47.000000000 +0200
+++ autogen-5.18.12/pkg/libopts/mklibsrc.sh 2017-03-07 11:35:23.952528880 +0100
@@ -42,7 +42,7 @@ files='libopts.c gettext.h parse-duratio
fgrep '#include' libopts.c | \
sed -e 's,"$,,;s,#.*",,' )
-for f in ${files} intprops.h
+for f in ${files} intprops.h verify.h
do
test -f ${f} &&
cp -f ${f} ${tagd}/${f} && continue

View File

@ -11,6 +11,8 @@ 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
# Include verify.h in libopts tear-off tarball
Patch1: autogen-verifyh.patch
Requires: %{name}-libopts%{?_isa} = %{version}-%{release} Requires: %{name}-libopts%{?_isa} = %{version}-%{release}
Requires(post): /sbin/install-info Requires(post): /sbin/install-info
@ -57,6 +59,7 @@ This package contains development files for libopts.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .multilib %patch0 -p1 -b .multilib
%patch1 -p1 -b .verifyh
# Disable failing test # Disable failing test
sed -i 's|errors.test||' autoopts/test/Makefile.in sed -i 's|errors.test||' autoopts/test/Makefile.in