diff --git a/.gitignore b/.gitignore index 866c8ea..429f62c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ lksctp-tools-1.0.11.tar.gz /lksctp-tools-1.0.13.tar.gz /lksctp-tools-1.0.14.tar.gz /lksctp-tools-1.0.15.tar.gz +/lksctp-tools-1.0.16.tar.gz diff --git a/lksctp-tools-1.0.16-libdir.patch b/lksctp-tools-1.0.16-libdir.patch new file mode 100644 index 0000000..a70c287 --- /dev/null +++ b/lksctp-tools-1.0.16-libdir.patch @@ -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@ + export LD_PRELOAD=${LIBDIR}/libwithsctp.so.1.0.16 + if ! ${BINDIR}/checksctp 2> /dev/null diff --git a/lksctp-tools-1.0.6-libdir.patch b/lksctp-tools-1.0.6-libdir.patch deleted file mode 100644 index 393a774..0000000 --- a/lksctp-tools-1.0.6-libdir.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up lksctp-tools-1.0.11/src/withsctp/withsctp.in.orig lksctp-tools-1.0.11/src/withsctp/withsctp.in ---- lksctp-tools-1.0.11/src/withsctp/withsctp.in.orig 2009-10-24 02:49:15.000000000 +0200 -+++ lksctp-tools-1.0.11/src/withsctp/withsctp.in 2009-12-01 13:46:30.000000000 +0100 -@@ -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.15 - if ! ${BINDIR}/checksctp 2> /dev/null diff --git a/lksctp-tools.spec b/lksctp-tools.spec index f99550a..00d7ffc 100644 --- a/lksctp-tools.spec +++ b/lksctp-tools.spec @@ -1,13 +1,14 @@ +Name: lksctp-tools Summary: User-space access to Linux Kernel SCTP -Name: lksctp-tools -Version: 1.0.15 -Release: 2%{?dist} +Version: 1.0.16 +Release: 1%{?dist} # src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification License: GPLv2 and GPLv2+ and LGPLv2 and MIT -Group: System Environment/Libraries -URL: http://lksctp.sourceforge.net -Source0: http://downloads.sourceforge.net/lksctp/%{name}-%{version}.tar.gz -Patch0: lksctp-tools-1.0.6-libdir.patch +Group: System Environment/Libraries +URL: http://lksctp.sourceforge.net + +Source0: http://downloads.sourceforge.net/lksctp/%{name}-%{version}.tar.gz +Patch0: lksctp-tools-1.0.16-libdir.patch BuildRequires: libtool, automake, autoconf %description @@ -25,7 +26,7 @@ This package contains the base run-time library and command-line tools. %package devel Summary: Development files for lksctp-tools Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for lksctp-tools which include man pages, header files, @@ -34,7 +35,7 @@ static libraries, symlinks to dynamic libraries and some tutorial source code. %package doc Summary: Documents pertaining to SCTP Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description doc Documents pertaining to LKSCTP & SCTP in general (IETF RFC's & Internet @@ -57,23 +58,21 @@ make %{?_smp_mflags} rm -f doc/rfc2960.txt doc/states.txt make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p" -find $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la" | xargs rm -f +find $RPM_BUILD_ROOT -type f -name "*.la" -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING* README %{_bindir}/* -%{_libdir}/libsctp.so.* +%{_libdir}/libsctp.so.1* %dir %{_libdir}/lksctp-tools/ -%{_libdir}/lksctp-tools/libwithsctp.so.* +%{_libdir}/lksctp-tools/libwithsctp.so.1* %{_mandir}/man7/* %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/libsctp.so %{_libdir}/lksctp-tools/libwithsctp.so @@ -81,10 +80,13 @@ find $RPM_BUILD_ROOT/%{_libdir}/ -name "*.la" | xargs rm -f %{_mandir}/man3/* %files doc -%defattr(-,root,root,-) %doc doc/*.txt %changelog +* Tue May 6 2014 Peter Robinson 1.0.16-1 +- Update to 1.0.16 +- Spec cleanups + * Sat Aug 03 2013 Fedora Release Engineering - 1.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index a30ea7e..9b950b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d829677541fb41061e7f4d61f8413b07 lksctp-tools-1.0.15.tar.gz +708bb0b5a6806ad6e8d13c55b067518e lksctp-tools-1.0.16.tar.gz