From 4545342762bb8c2957a5d4e615cac7d060f54cc3 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Tue, 19 Sep 2006 13:36:12 +0000 Subject: [PATCH] - fix fileconflict (#205225) --- lksctp-tools-1.0.6-libdir.patch | 10 ++++++++++ lksctp-tools.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 lksctp-tools-1.0.6-libdir.patch diff --git a/lksctp-tools-1.0.6-libdir.patch b/lksctp-tools-1.0.6-libdir.patch new file mode 100644 index 0000000..2d46fce --- /dev/null +++ b/lksctp-tools-1.0.6-libdir.patch @@ -0,0 +1,10 @@ +--- lksctp-tools-1.0.6/src/withsctp/withsctp.in.libdir 2006-09-19 15:10:53.000000000 +0200 ++++ lksctp-tools-1.0.6/src/withsctp/withsctp.in 2006-09-19 15:12:50.000000000 +0200 +@@ -1,6 +1,6 @@ + #!/bin/sh + # -*- sh -*- +-LIBDIR=@libdir@/@PACKAGE@ ++LIBDIR=`rpm --eval "%{_libdir}"`/@PACKAGE@ + BINDIR=@bindir@ + export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.6 + if ! ${BINDIR}/checksctp 2> /dev/null diff --git a/lksctp-tools.spec b/lksctp-tools.spec index 41e8e1c..65622cb 100644 --- a/lksctp-tools.spec +++ b/lksctp-tools.spec @@ -1,11 +1,12 @@ Summary: User-space access to Linux Kernel SCTP Name: lksctp-tools Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://lksctp.sourceforge.net Source0: %{name}-%{version}.tar.gz +Patch0: lksctp-tools-1.0.6-libdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot #BuildRequires: tetex, tetex-latex, tetex-xdvi, tetex-dvips #BuildRequires: ghostscript, enscript @@ -44,6 +45,7 @@ Drafts). %prep %setup -q +%patch0 -p1 %build [ ! -x ./configure ] && sh bootstrap @@ -89,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT %doc doc/*.txt %changelog +* Tue Sep 19 2006 Karsten Hopp 1.0.6-2 +- fix fileconflict (#205225) + * Tue Jul 25 2006 Karsten Hopp 1.0.6-1 - update to 1.0.6