From 40b91635266e21add7dc2d23d4d39489a5225450 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 17 Jan 2017 00:52:26 -0600 Subject: [PATCH] Recent revision - 20170116 Use system psl-make-dafsa --- .gitignore | 1 - publicsuffix-list.spec | 13 ++++++++----- sources | 3 +-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 936e5a4..0091269 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,3 @@ /index.txt /public_suffix_list.dat /test_psl.txt -/psl-make-dafsa diff --git a/publicsuffix-list.spec b/publicsuffix-list.spec index 6efb912..77e0293 100644 --- a/publicsuffix-list.spec +++ b/publicsuffix-list.spec @@ -1,4 +1,4 @@ -%global revdate 20161230 +%global revdate 20170116 Name: publicsuffix-list Version: %{revdate} @@ -10,11 +10,10 @@ URL: https://publicsuffix.org/ Source0: https://publicsuffix.org/list/public_suffix_list.dat Source1: https://www.mozilla.org/media/MPL/2.0/index.txt Source2: https://github.com/publicsuffix/list/raw/master/tests/test_psl.txt -Source3: https://github.com/rockdaboot/libpsl/raw/master/src/psl-make-dafsa BuildArch: noarch -BuildRequires: python3 +BuildRequires: psl-make-dafsa %description @@ -42,13 +41,13 @@ for runtime loading. %prep %setup -c -T -cp -av %{SOURCE0} %{SOURCE3} . +cp -av %{SOURCE0} . cp -av %{SOURCE1} COPYING %build LC_CTYPE=C.UTF-8 \ -python3 psl-make-dafsa --output-format=binary \ +psl-make-dafsa --output-format=binary \ public_suffix_list.dat public_suffix_list.dafsa @@ -73,6 +72,10 @@ ln -s public_suffix_list.dat $RPM_BUILD_ROOT/%{_datadir}/publicsuffix/effective_ %changelog +* Tue Jan 17 2017 Yaakov Selkowitz - 20170116-1 +- Recent revision - 20170116 +- Use system psl-make-dafsa + * Thu Jan 5 2017 Yaakov Selkowitz - 20161230-1 - Recent revision - 20161230 - Added dafsa package for runtime use by libpsl diff --git a/sources b/sources index 3816ffc..79e6df4 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ SHA512 (index.txt) = 200821d8e18270b50208764e1263206d3566b1fc2ed6cf3731d308f690fac0d7333a3e06189ee011dd849a3142fe60e9c5b4a7c599351639715ea3e6df148437 -SHA512 (psl-make-dafsa) = 2282dbc163df7bef4b2f65f835d500e50fcf2623e2bddcfe644e378d47318791cf6dd4d29e6463b4e64b5fe1ed2fb642edf7b99d4ef5e81d4c1a76227f23cbd2 -SHA512 (public_suffix_list.dat) = e6856c67eaa5be4d975171a661ac33c3d3d9545c7469e8005fbcd6acb965ff542174e1945e3848fd34a3d666eb2b652ed4fa627ff0f957cfc6d3ed344a17d986 +SHA512 (public_suffix_list.dat) = 2287dff73e4b4ecc2ef1e474f2cfd3f7c34be71b61b2e6c8108d3c1915660550676923f4291c857f699665f0900d3039d817b316dacda24048555b48516ede38 SHA512 (test_psl.txt) = 2e3a0a4170fb969ddb928d47f4bbe703137e500c353395ae6172ad097752539075554fc067c63df2e133da791b1b00d54fb928f99fb86d79a7375e38e6cbf310