[packages/hyperestraier] - adjusted am_ac patch to kill more unnecessary libnsl linking; release 12

[qboosh]

commit 08261a420522c2ff87ba8fb87814fb8a8fe6963d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Aug 26 16:43:14 2020 +0200

    - adjusted am_ac patch to kill more unnecessary libnsl linking; release 12

 hyperestraier-am_ac.patch | 32 ++++++++++++++++++++------------
 hyperestraier.spec        |  3 ++-
 2 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/hyperestraier.spec b/hyperestraier.spec
index 2d8fa34..da35b50 100644
--- a/hyperestraier.spec
+++ b/hyperestraier.spec
@@ -1,3 +1,4 @@
+# TODO: perl binding
 #
 # Conditional build:
 %bcond_without	fcgi		# build estseek.fcgi
@@ -12,7 +13,7 @@ Summary:	Full-text search system
 Summary(pl.UTF-8):	Pełnotekstowy system wyszukiwawczy
 Name:		hyperestraier
 Version:	1.4.13
-Release:	11
+Release:	12
 License:	LGPL v2.1+
 Group:		Applications/Text
 Source0:	http://downloads.sourceforge.net/hyperestraier/%{name}-%{version}.tar.gz
diff --git a/hyperestraier-am_ac.patch b/hyperestraier-am_ac.patch
index 22e7741..5809679 100644
--- a/hyperestraier-am_ac.patch
+++ b/hyperestraier-am_ac.patch
@@ -275,9 +275,9 @@ diff -Nur b.hyperestraier-1.2.3/configure.in n.hyperestraier-1.2.3/configure.in
 -then
 -  MYRUNPATH="$prefix/lib"
 -fi
-+AC_CHECK_LIB(nsl, main)
-+AC_CHECK_LIB(socket, main,)
-+AC_CHECK_LIB(resolv, main,)
++AC_SEARCH_LIBS(gethostname, nsl)
++AC_SEARCH_LIBS(socket, socket)
++AC_SEARCH_LIBS(gethostname, resolv)
  
  # Checking the version of QDBM with pkg-config
  if type pkg-config > /dev/null 2>&1
@@ -331,9 +331,8 @@ diff -Nur b.hyperestraier-1.2.3/javanative/Makefile.am n.hyperestraier-1.2.3/jav
 +	test -z "$(estraierdir)" || $(mkdir_p) "$(DESTDIR)$(estraierdir)" ; \
 +	echo " $(INSTALL_DATA) 'estraier.jar' '$(DESTDIR)$(estraierdir)/'"; \
 +	$(INSTALL_DATA) "estraier.jar" "$(DESTDIR)$(estraierdir)/";
-diff -Nur b.hyperestraier-1.2.3/javanative/configure.in n.hyperestraier-1.2.3/javanative/configure.in
---- b.hyperestraier-1.2.3/javanative/configure.in	2006-01-25 07:27:42.000000000 +0100
-+++ n.hyperestraier-1.2.3/javanative/configure.in	2006-04-29 14:59:31.000000000 +0200
+--- hyperestraier-1.4.13/javanative/configure.in.orig	2007-03-07 03:59:13.000000000 +0100
++++ hyperestraier-1.4.13/javanative/configure.in	2020-08-26 06:42:18.249781204 +0200
 @@ -9,46 +9,33 @@
  
  # Targets
@@ -391,15 +390,24 @@ diff -Nur b.hyperestraier-1.2.3/javanative/configure.in n.hyperestraier-1.2.3/ja
  
  
  #================================================================
-@@ -146,7 +133,6 @@
- AC_CHECK_LIB(lzo2, main)
- AC_CHECK_LIB(bz2, main)
- AC_CHECK_LIB(qdbm, main)
+@@ -150,16 +137,6 @@
+ AC_CHECK_SIZEOF(void *)
+ AC_CHECK_SIZEOF(int)
+ 
+-# Underlying libraries
+-AC_CHECK_LIB(c, main)
+-AC_CHECK_LIB(m, main)
+-AC_CHECK_LIB(iconv, main)
+-AC_CHECK_LIB(z, main)
+-AC_CHECK_LIB(lzo2, main)
+-AC_CHECK_LIB(bz2, main)
+-AC_CHECK_LIB(qdbm, main)
 -AC_CHECK_LIB(estraier, main)
- 
+-
  # For libraries of pthreads
  AC_CHECK_LIB(pthread, main, MYMTLIBS="-lpthread $MYMTLIBS",
-@@ -175,6 +161,7 @@
+   AC_CHECK_LIB(c_r, main, MYMTLIBS="-lc_r $MYMTLIBS"))
+@@ -187,6 +164,7 @@
  # Export variables
  AC_SUBST(LIBVER)
  AC_SUBST(LIBREV)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/hyperestraier.git/commitdiff/08261a420522c2ff87ba8fb87814fb8a8fe6963d