Fix multilib conflicts (#831379)
This commit is contained in:
parent
57b0474cf8
commit
7ddb07e9d8
50
autogen-multilib.patch
Normal file
50
autogen-multilib.patch
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
diff -up autogen-5.18/autoopts/autoopts-config.in.multilib autogen-5.18/autoopts/autoopts-config.in
|
||||||
|
--- autogen-5.18/autoopts/autoopts-config.in.multilib 2013-07-15 02:37:20.000000000 +0200
|
||||||
|
+++ autogen-5.18/autoopts/autoopts-config.in 2013-07-29 15:41:26.654229342 +0200
|
||||||
|
@@ -17,17 +17,17 @@
|
||||||
|
includedir="@includedir@"
|
||||||
|
exec_prefix="@exec_prefix@"
|
||||||
|
bindir="@bindir@"
|
||||||
|
- libdir="@libdir@"
|
||||||
|
- ldopts="@AG_LDFLAGS@"
|
||||||
|
+ libdir=""
|
||||||
|
+ ldopts=""
|
||||||
|
exeext="@EXEEXT@"
|
||||||
|
version="@AO_CURRENT@:@AO_REVISION@:@AO_AGE@"
|
||||||
|
dotver="@AO_CURRENT@.@AO_REVISION@.@AO_AGE@"
|
||||||
|
pkgdatadir="${datadir}/${package}"
|
||||||
|
autogen="${bindir}/autogen${exeext}"
|
||||||
|
- ldflags="-L${libdir} -lopts"
|
||||||
|
+ ldflags="-lopts"
|
||||||
|
libs="${ldflags}"
|
||||||
|
libsrc="${pkgdatadir}/libopts-${dotver}.tar.gz"
|
||||||
|
- static_libs="${libdir}/libopts.a"
|
||||||
|
+ static_libs=""
|
||||||
|
cflags="-I${includedir}"
|
||||||
|
test 'X@ENABLE_STATIC@' = Xno && static_libs=''
|
||||||
|
case "${libdir}" in
|
||||||
|
diff -up autogen-5.18/autoopts/mk-autoopts-pc.in.multilib autogen-5.18/autoopts/mk-autoopts-pc.in
|
||||||
|
--- autogen-5.18/autoopts/mk-autoopts-pc.in.multilib 2013-07-15 02:37:20.000000000 +0200
|
||||||
|
+++ autogen-5.18/autoopts/mk-autoopts-pc.in 2013-07-29 15:49:20.603890010 +0200
|
||||||
|
@@ -17,17 +17,17 @@
|
||||||
|
includedir="@includedir@"
|
||||||
|
exec_prefix="@exec_prefix@"
|
||||||
|
bindir="@bindir@"
|
||||||
|
- libdir="@libdir@"
|
||||||
|
- ldopts="@AG_LDFLAGS@"
|
||||||
|
+ libdir=""
|
||||||
|
+ ldopts=""
|
||||||
|
exeext="@EXEEXT@"
|
||||||
|
version="@AO_CURRENT@:@AO_REVISION@:@AO_AGE@"
|
||||||
|
dotver="@AO_CURRENT@.@AO_REVISION@.@AO_AGE@"
|
||||||
|
pkgdatadir="${datadir}/${package}"
|
||||||
|
autogen="${bindir}/autogen${exeext}"
|
||||||
|
- ldflags="-L${libdir} -lopts"
|
||||||
|
+ ldflags="-lopts"
|
||||||
|
libs="${ldflags}"
|
||||||
|
libsrc="${pkgdatadir}/libopts-${dotver}.tar.gz"
|
||||||
|
- static_libs="${libdir}/libopts.a"
|
||||||
|
+ static_libs=""
|
||||||
|
cflags="-I${includedir}"
|
||||||
|
test 'X@ENABLE_STATIC@' = Xno && static_libs=''
|
||||||
|
case "${libdir}" in
|
@ -9,6 +9,9 @@ Group: Development/Tools
|
|||||||
URL: http://www.gnu.org/software/autogen/
|
URL: http://www.gnu.org/software/autogen/
|
||||||
Source0: ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
|
Source0: ftp://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
# Fix multilib conflicts
|
||||||
|
Patch0: autogen-multilib.patch
|
||||||
|
|
||||||
Requires: %{name}-libopts%{?_isa} = %{version}-%{release}
|
Requires: %{name}-libopts%{?_isa} = %{version}-%{release}
|
||||||
Requires(post): /sbin/install-info
|
Requires(post): /sbin/install-info
|
||||||
Requires(preun): /sbin/install-info
|
Requires(preun): /sbin/install-info
|
||||||
@ -51,6 +54,7 @@ This package contains development files for libopts.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1 -b .multilib
|
||||||
|
|
||||||
# Disable failing test
|
# Disable failing test
|
||||||
sed -i 's|errors.test||' autoopts/test/Makefile.in
|
sed -i 's|errors.test||' autoopts/test/Makefile.in
|
||||||
@ -76,6 +80,10 @@ make install INSTALL="%{__install} -p" DESTDIR=$RPM_BUILD_ROOT
|
|||||||
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
|
find $RPM_BUILD_ROOT -type f -name "*.la" -delete
|
||||||
find $RPM_BUILD_ROOT -type f -name "*.a" -delete
|
find $RPM_BUILD_ROOT -type f -name "*.a" -delete
|
||||||
|
|
||||||
|
# Remove time stamps from generated devel man pages to avoid multilib conflicts
|
||||||
|
sed -i 's|\(It has been AutoGen-ed\).*.\(by AutoGen\)|\1 \2|' \
|
||||||
|
$RPM_BUILD_ROOT%{_mandir}/man3/*.3
|
||||||
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||||
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autoopts.m4
|
rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/autoopts.m4
|
||||||
|
Loading…
Reference in New Issue
Block a user