rpms/lksctp-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix undeclared file conflicts

Browse Source 
The issue happens when installing both i686 and x86_64 lksctp-tools rpms.
It is caused by one missing old patch, so fix it by bringing it back.

Related: rhbz#2031786

Signed-off-by: Xin Long <lxin@redhat.com>
This commit is contained in:
Xin Long 2022-04-12 09:09:32 -04:00 committed by Xin Long
parent 379332bf5d
commit d3185c9034
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lksctp-tools-1.0.19-libdir.patch Normal file
View File

@ -0,0 +1,10 @@
--- lksctp-tools-1.0.16/src/withsctp/withsctp.in.orig 2014-02-18 10:42:49.000000000 +0000
+++ lksctp-tools-1.0.16/src/withsctp/withsctp.in 2014-05-06 12:24:12.931873787 +0100
@@ -1,6 +1,6 @@
#!/bin/sh
# -*- sh -*-
-LIBDIR=@libdir@/@PACKAGE@
+LIBDIR=`rpm --eval "%{_libdir}"`/@PACKAGE@
BINDIR=@bindir@
LIBVER=@LIBWITHSCTP_CURRENT@.@LIBWITHSCTP_AGE@.@LIBWITHSCTP_REVISION@
export LD_PRELOAD=${LIBDIR}/libwithsctp.so.${LIBVER}

16
lksctp-tools.spec
View File

@ -1,17 +1,18 @@
Name: lksctp-tools Name: lksctp-tools
Summary: User-space access to Linux Kernel SCTP Summary: User-space access to Linux Kernel SCTP
Version: 1.0.19 Version: 1.0.19
Release: 1%{?dist} Release: 2%{?dist}
# src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
License: GPLv2 and GPLv2+ and LGPLv2 and MIT License: GPLv2 and GPLv2+ and LGPLv2 and MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://lksctp.sourceforge.net URL: http://lksctp.sourceforge.net
Source0: https://github.com/sctp/lksctp-tools/archive/%{name}-%{version}.tar.gz Source0: https://github.com/sctp/lksctp-tools/archive/%{name}-%{version}.tar.gz
Patch0: myftp-replace-use-of-deprecated-gethostbyname-with-g.patch Patch0: lksctp-tools-1.0.19-libdir.patch
Patch1: sctp_xconnect-replace-use-of-deprecated-gethostbynam.patch Patch1: myftp-replace-use-of-deprecated-gethostbyname-with-g.patch
Patch2: sctp_test-replace-use-of-deprecated-gethostbyname-wi.patch Patch2: sctp_xconnect-replace-use-of-deprecated-gethostbynam.patch
Patch3: sctp_darn-replace-use-of-deprecated-gethostbyname-wi.patch Patch3: sctp_test-replace-use-of-deprecated-gethostbyname-wi.patch
Patch4: sctp_darn-replace-use-of-deprecated-gethostbyname-wi.patch
BuildRequires: libtool, automake, autoconf, make BuildRequires: libtool, automake, autoconf, make
%description %description
@ -50,6 +51,7 @@ Drafts).
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
[ ! -x ./configure ] && sh bootstrap [ ! -x ./configure ] && sh bootstrap
@ -86,6 +88,10 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
%doc doc/*.txt %doc doc/*.txt
%changelog %changelog
* Tue Apr 12 2022 Xin Long <lxin@redhat.com> - 1.0.19-2
- Bring back one RHEL specific patch to fix the installation issue.
Related: rhbz#2031786
* Wed Nov 17 2021 Xin Long <lxin@redhat.com> - 1.0.19-1 * Wed Nov 17 2021 Xin Long <lxin@redhat.com> - 1.0.19-1
- Rebase to 1.0.19 and append the fixes for gethostbyname. - Rebase to 1.0.19 and append the fixes for gethostbyname.
Related: rhbz#1982820 Related: rhbz#1982820