[packages/eb] - added link patch (kill unnecessary linking with -lnsl); release 5

qboosh qboosh at pld-linux.org
Mon Aug 31 06:21:11 CEST 2020


commit edc12787e84e7635a2f292788c2fc630516794b3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon Aug 31 06:23:45 2020 +0200

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

 eb-link.patch | 18 ++++++++++++++++++
 eb.spec       | 18 ++++++++++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
---
diff --git a/eb.spec b/eb.spec
index 58166fa..51d648d 100644
--- a/eb.spec
+++ b/eb.spec
@@ -7,12 +7,16 @@ Summary:	Library for accessing CD-ROM books
 Summary(pl.UTF-8):	Biblioteka dostępu do książek na płytach CD-ROM
 Name:		eb
 Version:	4.4.3
-Release:	4
+Release:	5
 License:	BSD
 Group:		Libraries
 Source0:	ftp://ftp.sra.co.jp/pub/misc/eb/%{name}-%{version}.tar.bz2
 # Source0-md5:	17dd1fade7ba0b82ce6e60f19fcbc823
-URL:		http://www.sra.co.jp/people/m-kasahr/eb/
+Patch0:		%{name}-link.patch
+URL:		https://github.com/yasuhirokimura/eb
+BuildRequires:	autoconf >= 2.54
+BuildRequires:	automake
+BuildRequires:	libtool
 BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,7 +74,7 @@ Statyczna biblioteka EB.
 Summary:	EB API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki EB
 Group:		Documentation
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
@@ -82,8 +86,14 @@ Dokumentacja API biblioteki EB.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--enable-samples \
 	--enable-pthread \
@@ -127,10 +137,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%{_sysconfdir}/eb.conf
 %attr(755,root,root) %{_libdir}/libeb.so
 %{_libdir}/libeb.la
 %{_includedir}/eb
+%{_sysconfdir}/eb.conf
 %{_aclocaldir}/eb4.m4
 
 %if %{with static_libs}
diff --git a/eb-link.patch b/eb-link.patch
new file mode 100644
index 0000000..b6acc5b
--- /dev/null
+++ b/eb-link.patch
@@ -0,0 +1,18 @@
+--- eb-4.4.3/configure.ac.orig	2010-03-08 13:18:28.000000000 +0100
++++ eb-4.4.3/configure.ac	2020-08-31 06:15:57.001336125 +0200
+@@ -237,12 +237,9 @@
+ dnl * 
+ dnl * Libraries.
+ dnl * 
+-AC_CHECK_LIB(resolv, res_query)
+-if test "$ac_cv_lib_resolv_res_query" = no; then
+-    AC_CHECK_LIB(bind, res_query)
+-fi
+-AC_CHECK_LIB(nsl, gethostname)
+-AC_CHECK_LIB(socket, socket)
++AC_SEARCH_LIBS(res_query, [resolv bind])
++AC_SEARCH_LIBS(gethostname, nsl)
++AC_SEARCH_LIBS(socket, socket)
+ 
+ dnl * 
+ dnl * Library Functions.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eb.git/commitdiff/edc12787e84e7635a2f292788c2fc630516794b3



More information about the pld-cvs-commit mailing list