- new URLs, updated to 0.9

- removed outdated DESTDIR,mandir patches
- added link patch (avoid unnecessary linking with libnsl, libresolv)
- added am patch (fix build)

diff --git a/thrulay-DESTDIR.patch b/thrulay-DESTDIR.patch
deleted file mode 100644 (file)
index 7246004..0000000
--- a/thrulay-DESTDIR.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- thrulay-0.8/doc/Makefile.in~       2005-10-02 20:08:14.000000000 +0200
-+++ thrulay-0.8/doc/Makefile.in        2007-07-06 21:53:32.202594838 +0200
-@@ -18,11 +18,11 @@
-       rm -f Makefile
- 
- install-man:
--      $(MKINSTALLDIRS) $(MANDIR1)
--      $(MKINSTALLDIRS) $(MANDIR8)
--      $(INSTALL) -c -m 0644 thrulay.1 $(MANDIR1)
--      $(INSTALL) -c -m 0644 thrulayd.8 $(MANDIR8)
-+      $(MKINSTALLDIRS) $(DESTDIR)$(MANDIR1)
-+      $(MKINSTALLDIRS) $(DESTDIR)$(MANDIR8)
-+      $(INSTALL) -c -m 0644 thrulay.1 $(DESTDIR)$(MANDIR1)
-+      $(INSTALL) -c -m 0644 thrulayd.8 $(DESTDIR)$(MANDIR8)
- 
- uninstall-man:
--      rm -f $(MANDIR1)/thrulay.1
--      rm -f $(MANDIR8)/thrulayd.8
-+      rm -f $(DESTDIR)$(MANDIR1)/thrulay.1
-+      rm -f $(DESTDIR)$(MANDIR8)/thrulayd.8
---- thrulay-0.8/src/Makefile.in~       2005-10-18 01:22:18.000000000 +0200
-+++ thrulay-0.8/src/Makefile.in        2007-07-06 21:56:08.614922715 +0200
-@@ -43,8 +43,8 @@
-       rm -f Makefile
- 
- install:
--      $(INSTALL) -c -m 0755 -s $(CLIENT) $(bindir)/$(CLIENT)
--      $(INSTALL) -c -m 0755 -s $(SERVER) $(sbindir)/$(SERVER)
-+      $(INSTALL) -c -m 0755 -s $(CLIENT) $(DESTDIR)$(bindir)/$(CLIENT)
-+      $(INSTALL) -c -m 0755 -s $(SERVER) $(DESTDIR)$(sbindir)/$(SERVER)
- 
- uninstall:
-       rm -f $(bindir)/$(CLIENT)

diff --git a/thrulay-am.patch b/thrulay-am.patch
new file mode 100644 (file)
index 0000000..d0ad81b
--- /dev/null
+++ b/thrulay-am.patch
@@ -0,0 +1,16 @@
+--- thrulay-0.9/src/Makefile.am.orig   2006-08-19 01:12:30.000000000 +0200
++++ thrulay-0.9/src/Makefile.am        2020-08-26 21:24:34.766332826 +0200
+@@ -26,11 +26,11 @@
+ 
+ thrulay_SOURCES = thrulay.h thrulay.c
+ 
+-thrulay_LDFLAGS = libthrulay.la
++thrulay_LDADD = libthrulay.la
+ 
+ thrulayd_SOURCES = thrulayd.h thrulayd.c
+ 
+-thrulayd_LDFLAGS = libthrulay.la
++thrulayd_LDADD = libthrulay.la
+ 
+ indent:
+       $(INDENT) -orig *.c *.h

diff --git a/thrulay-link.patch b/thrulay-link.patch
new file mode 100644 (file)
index 0000000..f4e1c44
--- /dev/null
+++ b/thrulay-link.patch
@@ -0,0 +1,16 @@
+--- thrulay-0.9/configure.ac.orig      2007-02-01 10:19:39.000000000 +0100
++++ thrulay-0.9/configure.ac   2020-08-26 20:36:35.551930868 +0200
+@@ -61,10 +61,9 @@
+ 
+ # Checks for libraries.
+ AC_CHECK_LIB([m], [log])
+-AC_CHECK_LIB([socket], [socket])
+-AC_CHECK_LIB([nsl], [socket])
+-AC_CHECK_LIB([resolv], [herror])
+-AC_CHECK_LIB([rt], [nanosleep])
++AC_SEARCH_LIBS([socket], [socket nsl])
++AC_SEARCH_LIBS([herror], [resolv])
++AC_SEARCH_LIBS([nanosleep], [rt])
+ AC_CHECK_LIB([fasttime], [fasttime_init_context])
+ AC_CHECK_LIB([tsci2], [tsci2_init])
+ 

diff --git a/thrulay-mandir.patch b/thrulay-mandir.patch
deleted file mode 100644 (file)
index 73baa44..0000000
--- a/thrulay-mandir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- thrulay-0.8/doc/Makefile.in~       2007-07-06 21:59:18.000000000 +0200
-+++ thrulay-0.8/doc/Makefile.in        2007-07-06 21:59:58.251148729 +0200
-@@ -5,8 +5,8 @@
- 
- INSTALL               = @top_builddir@install-sh
- MKINSTALLDIRS = @top_builddir@mkinstalldirs
--MANDIR1               = @prefix@/man/man1
--MANDIR8               = @prefix@/man/man8
-+MANDIR1               = @mandir@/man1
-+MANDIR8               = @mandir@/man8
- 
- @SET_MAKE@
- 

diff --git a/thrulay.spec b/thrulay.spec
index ecb880151974837878994d03594bec6e4f1ed93b..d3ee5d970a733fac7d223b6b0eb9fc5bc4563a00 100644 (file)
--- a/thrulay.spec
+++ b/thrulay.spec
@@ -1,15 +1,22 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library
+
 Summary:       thrulay - measuring capacity of a network
 Summary(pl.UTF-8):     thrulay - określanie przepustowości sieci
 Name:          thrulay
-Version:       0.8
+Version:       0.9
 Release:       1
-License:       BSD Like (see included LICENSE)
+License:       BSD-like (see included LICENSE)
 Group:         Networking
-Source0:       http://shlang.com/thrulay/%{name}-%{version}.tar.gz
-# Source0-md5: 725fb13344608a652e818bcd16fe9ef6
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-mandir.patch
-URL:           http://www.internet2.edu/~shalunov/thrulay/
+Source0:       http://downloads.sourceforge.net/thrulay/%{name}-%{version}.tar.bz2
+# Source0-md5: 3c01c221aae8ad8ab850b2408de841a0
+Patch0:                %{name}-link.patch
+Patch1:                %{name}-am.patch
+URL:           https://sourceforge.net/projects/thrulay/
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake
+BuildRequires: libtool
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,13 +27,43 @@ sending a bulk TCP stream over it.
 Narzędzie służące do mierzenia pojemności sieci przez wysyłanie przez
 nią strumieni TCP.
 
+%package devel
+Summary:       Header files for thrulay library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki thrulay
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description devel
+Header files for thrulay library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki thrulay.
+
+%package static
+Summary:       Static thrulay library
+Summary(pl.UTF-8):     Statyczna biblioteka thrulay
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description static
+Static thrulay library.
+
+%description static -l pl.UTF-8
+Statyczna biblioteka thrulay.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+       %{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
@@ -38,9 +75,27 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc README TODO LICENSE
-%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_sbindir}/%{name}d
-%{_mandir}/man?/%{name}*
+%doc ChangeLog LICENSE README TODO
+%attr(755,root,root) %{_bindir}/thrulay
+%attr(755,root,root) %{_sbindir}/thrulayd
+%attr(755,root,root) %{_libdir}/libthrulay.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libthrulay.so.0
+%{_mandir}/man1/thrulay.1*
+%{_mandir}/man8/thrulayd.8*
+
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libthrulay.so
+%{_libdir}/libthrulay.la
+%{_includedir}/thrulay
+
+%if %{with static_libs}
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libthrulay.a
+%endif