- added link patch (kill unnecessary linking with -lnsl); release 9

diff --git a/netris-link.patch b/netris-link.patch
new file mode 100644 (file)
index 0000000..7e0fc93
--- /dev/null
+++ b/netris-link.patch
@@ -0,0 +1,15 @@
+--- netris-0.52/Configure.orig 2020-08-30 19:57:09.019142324 +0200
++++ netris-0.52/Configure      2020-08-30 20:18:09.572313322 +0200
+@@ -81,11 +81,7 @@
+ for lib in -lcurses -lncurses; do
+       if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
+               LFLAGS="$lib"
+-      fi
+-done
+-for lib in -lsocket -lnsl -ltermcap; do 
+-      if $CC $CFLAGS $LEXTRA test.c $lib > /dev/null 2>&1; then
+-              LFLAGS="$LFLAGS $lib"
++              break
+       fi
+ done
+ 

diff --git a/netris.spec b/netris.spec
index 2ab63d1afaa6355f7311d7216cb305b01ce259c9..fd3b8dd440936feb8ee94380dd8da475cc379e8d 100644 (file)
--- a/netris.spec
+++ b/netris.spec
@@ -2,13 +2,14 @@ Summary:      A free networked version of T*tris
 Summary(pl.UTF-8):     Darmowa, sieciowa wersja T*trisa
 Name:          netris
 Version:       0.52
-Release:       8
-License:       GPL
+Release:       9
+License:       GPL v2+
 Group:         Applications/Games
 Source0:       ftp://ftp.netris.org/pub/netris/%{name}-%{version}.tar.gz
 # Source0-md5: b55af5697175ee06f7c6e40101979c38
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-debian.patch
+Patch2:                %{name}-link.patch
 URL:           http://www.netris.org/
 BuildRequires: ncurses-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -23,10 +24,14 @@ Darmowa, sieciowa wersja T*trisa.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 ./Configure \
-       --copt "%{rpmcflags}"
+       --cc "%{__cc}" \
+       --copt "%{rpmcflags} %{rpmcppflags}" \
+       --lextra "%{rpmldflags}"
+
 %{__make} proto.h
 %{__make}
 
@@ -43,5 +48,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README FAQ *_desc
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man6/*
+%attr(755,root,root) %{_bindir}/netris
+%attr(755,root,root) %{_bindir}/sr
+%{_mandir}/man6/netris.6*
+%{_mandir}/man6/netris-sample-robot.6*