[packages/libpsl] - switch to libidn2 by default to reduce curl/wget dependencies (they already use libidn2 and no icu

qboosh qboosh at pld-linux.org
Sat Mar 11 08:27:42 CET 2017


commit 10680ea939388231af2c903e82bff96e4c2ba04d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 11 08:29:49 2017 +0100

    - switch to libidn2 by default to reduce curl/wget dependencies (they already use libidn2 and no icu)
    - release 3

 libpsl.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/libpsl.spec b/libpsl.spec
index 0241088..1f553dc 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -1,12 +1,13 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# static library
+%bcond_with	icu		# use ICU instead of libidn2+libunistring for IDNA2008
 
 Summary:	C library for the Publix Suffix List
 Summary(pl.UTF-8):	Biblioteka C do obsługi listy przyrostków publicznych (Public Suffix List)
 Name:		libpsl
 Version:	0.17.0
-Release:	2
+Release:	3
 License:	MIT
 Group:		Networking
 #Source0Download: https://github.com/rockdaboot/libpsl/releases
@@ -26,7 +27,8 @@ BuildRequires:	automake >= 1:1.10
 BuildRequires:	gettext-tools >= 0.18.1
 BuildRequires:	glib2-devel
 BuildRequires:	gtk-doc >= 1.15
-BuildRequires:	libicu-devel
+%{?with_icu:BuildRequires:	libicu-devel}
+%{!?with_icu:BuildRequires:	libidn2-devel}
 BuildRequires:	libtool >= 2:2
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
@@ -160,6 +162,8 @@ rmdir list
 	%{!?with_static_libs:--disable-static} \
 	--enable-gtk-doc \
 	--enable-man \
+	--enable-builtin=%{?with_icu:libicu}%{!?with_icu:libidn2} \
+	--enable-runtime=%{?with_icu:libicu}%{!?with_icu:libidn2} \
 	--with-html-dir=%{_gtkdocdir}
 
 %{__make}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libpsl.git/commitdiff/10680ea939388231af2c903e82bff96e4c2ba04d



More information about the pld-cvs-commit mailing list