diff --git a/.gitignore b/.gitignore index 64b35c2..db56e4f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libpsl-0.13.0.tar.gz /libpsl-0.14.0.tar.gz /libpsl-0.15.0.tar.gz +/libpsl-0.16.1.tar.gz diff --git a/libpsl.spec b/libpsl.spec index 5ddd843..33d929b 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -1,5 +1,5 @@ Name: libpsl -Version: 0.15.0 +Version: 0.16.1 Release: 1%{?dist} Summary: C library for the Publix Suffix List License: MIT @@ -13,6 +13,7 @@ BuildRequires: libidn2-devel BuildRequires: libunistring-devel BuildRequires: libxslt BuildRequires: publicsuffix-list +Requires: publicsuffix-list-dafsa %description libpsl is a C library to handle the Public Suffix List. A "public suffix" is a @@ -54,6 +55,15 @@ This package contains a commandline utility to explore the Public Suffix List, for example it checks if domains are public suffixes, checks if cookie-domain is acceptable for domains and so on. +%package -n psl-make-dafsa +Summary: Compiles the Public Suffix List into DAFSA form + +%description -n psl-make-dafsa +This script produces C/C++ code or an architecture-independent binary object +which represents a Deterministic Acyclic Finite State Automaton (DAFSA) +from a plain text Public Suffix List. + + %prep %setup -q rm -frv list @@ -67,7 +77,7 @@ rm -frv list # 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 +# compiled list, which is generated at buildtime and the testsuite 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 @@ -82,7 +92,8 @@ rm -frv list --enable-gtk-doc \ --enable-builtin=libicu \ --enable-runtime=libidn2 \ - --with-psl-file=%{_datadir}/publicsuffix/effective_tld_names.dat \ + --with-psl-distfile=%{_datadir}/publicsuffix/public_suffix_list.dafsa \ + --with-psl-file=%{_datadir}/publicsuffix/effective_tld_names.dat \ --with-psl-testfile=%{_datadir}/publicsuffix/test_psl.txt %make_build @@ -90,8 +101,8 @@ rm -frv list %install %make_install -# the corresponding script is noinst -rm %{buildroot}%{_mandir}/man1/psl-make-dafsa.1* +# the script is noinst but the manpage is installed +install -m0755 src/psl-make-dafsa %{buildroot}%{_bindir}/ find %{buildroot} -name '*.la' -delete -print @@ -121,7 +132,15 @@ make check || cat tests/test-suite.log %{_bindir}/psl %{_mandir}/man1/psl.1* +%files -n psl-make-dafsa +%license COPYING +%{_bindir}/psl-make-dafsa +%{_mandir}/man1/psl-make-dafsa.1* + %changelog +* Thu Jan 5 2017 Yaakov Selkowitz - 0.16.1-1 +- new version (#1403620) + * Tue Nov 15 2016 Yaakov Selkowitz - 0.15.0-1 - new version (#1394761) diff --git a/sources b/sources index 7030c66..a917b58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2431ca17258c345ba8c6f2346e3bf223 libpsl-0.15.0.tar.gz +SHA512 (libpsl-0.16.1.tar.gz) = 409c06dd3661ef07cfcea4402454d55609c7448032d074cf10795809745b0130e7954f29c9fea5a3964a749f3ec4bcf20cf10cfd86d332fb8ddc72302fe4ba80