From 70729f14857fa05de2a7e5a7dc95388aea3c150f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Nov 04 2016 06:17:08 +0000
Subject: Switch to libidn2 at runtime


- Rebuilt with publicsuffix-list-20161028

---

diff --git a/libpsl.spec b/libpsl.spec
index bdffd39..203c7af 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -1,6 +1,6 @@
 Name:           libpsl
 Version:        0.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C library for the Publix Suffix List
 License:        MIT
 URL:            https://rockdaboot.github.io/libpsl
@@ -9,7 +9,7 @@ BuildRequires:  gettext-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk-doc
 BuildRequires:  libicu-devel
-BuildRequires:  libidn-devel
+BuildRequires:  libidn2-devel
 BuildRequires:  libunistring-devel
 BuildRequires:  libxslt
 BuildRequires:  publicsuffix-list
@@ -65,18 +65,23 @@ rm -frv list
 # [ -f configure ] || autoreconf -fiv
 # autoreconf -fiv
 
-# libicu does allow support for a newer IDN specification than libidn.
-# However, libpsl mostly relies on an internally compiled list, which is
-# generated at buildtime and the support thereof requires either libidn
-# or libicu only at buildtime; the runtime requirement is only for
-# loading external lists, which IIUC neither curl nor wget support.
-# As both already depend on libidn, this helps minimize dependencies.
+# libicu does allow support for a newer IDN specification (IDN 2008) than
+# libidn 1.x (IDN 2003). However, libpsl mostly relies on an internally
+# compiled list, which is generated at buildtime and the support thereof
+# requires either libidn or libicu only at buildtime; the runtime
+# requirement is only for loading external lists, which IIUC neither curl
+# nor wget support. libidn2 supports IDN 2008 as well, and is *much* smaller
+# than libicu.
+#
+# curl (as of 7.51.0-1.fc25) now depends on libidn2, and is a core package.
+# wget still uses libidn 1.x, but it is not a core package.  Therefore, use
+# libidn2 at runtime to help minimize core dependencies.
 %configure --disable-silent-rules \
            --disable-static       \
            --enable-man           \
            --enable-gtk-doc       \
            --enable-builtin=libicu \
-           --enable-runtime=libidn \
+           --enable-runtime=libidn2 \
            --with-psl-file=%{_datadir}/publicsuffix/effective_tld_names.dat           \
            --with-psl-testfile=%{_datadir}/publicsuffix/test_psl.txt
 
@@ -114,6 +119,10 @@ make check || cat tests/test-suite.log
 #{_mandir}/man1/psl.1*
 
 %changelog
+* Fri Nov 04 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.14.0-2
+- Switch to libidn2 at runtime
+- Rebuilt with publicsuffix-list-20161028
+
 * Mon Aug 15 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.14.0-1
 - new version (#1361781)