From 7450ba4768ede82cf084af7f8307418de96b524b Mon Sep 17 00:00:00 2001
From: Christopher Meng <i@cicku.me>
Date: Mon, 1 Feb 2016 12:08:28 +0800
Subject: [PATCH] Update to 0.12.0

---
 .gitignore  |  1 +
 libpsl.spec | 26 ++++++++++----------------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2023474..f189ab6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /libpsl-0.6.2.tar.gz
 /libpsl-0.7.0.tar.gz
 /libpsl-0.7.1.tar.gz
+/libpsl-0.12.0.tar.gz
diff --git a/libpsl.spec b/libpsl.spec
index 837fecf..c2b615e 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -1,17 +1,14 @@
 Name:           libpsl
-Version:        0.7.0
-Release:        7%{?dist}
+Version:        0.12.0
+Release:        1%{?dist}
 Summary:        C library for the Publix Suffix List
 License:        MIT
 URL:            https://rockdaboot.github.io/libpsl
-Source0:        https://github.com/rockdaboot/libpsl/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  automake
+Source0:        https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz
 BuildRequires:  gettext-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk-doc
 BuildRequires:  libicu-devel
-BuildRequires:  libtool
 BuildRequires:  libxslt
 BuildRequires:  publicsuffix-list
 
@@ -57,20 +54,20 @@ is acceptable for domains and so on.
 
 %prep
 %setup -q
-rm -frv data/effective_tld_names.dat
-sed -i 's|effective_tld_names.dat|$(PSL_FILE)|g' data/Makefile.am
+rm -frv list
 
 %build
 # Tarballs from github have 2 versions, one is raw files from repo, and
 # the other one from CDN contains pre-generated autotools files.
 # But makefile hack is not upstreamed yet so we continue reconfiguring these.
 # [ -f configure ] || autoreconf -fiv
-autoreconf -fiv
+# autoreconf -fiv
 %configure --disable-silent-rules \
            --disable-static       \
            --enable-man           \
            --enable-gtk-doc       \
-           --with-psl-file=%{_datadir}/publicsuffix/effective_tld_names.dat
+           --with-psl-file=%{_datadir}/publicsuffix/effective_tld_names.dat           \
+           --with-psl-testfile=%{_datadir}/publicsuffix/test_psl.txt
 
 %make_build
 
@@ -78,10 +75,6 @@ autoreconf -fiv
 %make_install
 
 find %{buildroot} -name '*.la' -delete -print
-# We need to unbundle the list completely, since the list is not small
-# in contrast with normal text files. Thus a symlink is the best choice.
-rm -fv %{buildroot}%{_datadir}/libpsl/effective_tld_names.dat
-ln -s %{_datadir}/publicsuffix/effective_tld_names.dat %{buildroot}%{_datadir}/libpsl/effective_tld_names.dat
 
 %check
 make check || cat tests/test-suite.log
@@ -97,8 +90,6 @@ make check || cat tests/test-suite.log
 %files devel
 %doc AUTHORS NEWS
 %{_datadir}/gtk-doc/html/libpsl/
-%{_datadir}/libpsl/
-%exclude %{_datadir}/libpsl/test_psl.txt
 %{_includedir}/libpsl.h
 %{_libdir}/libpsl.so
 %{_libdir}/pkgconfig/libpsl.pc
@@ -110,6 +101,9 @@ make check || cat tests/test-suite.log
 %{_bindir}/psl
 
 %changelog
+* Fri Jan 22 2016 Christopher Meng <rpm@cicku.me> - 0.12.0-1
+- Update to 0.12.0
+
 * Wed Oct 28 2015 David Tardon <dtardon@redhat.com> - 0.7.0-7
 - rebuild for ICU 56.1
 
diff --git a/sources b/sources
index f9229ef..2156f7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18e0b5481c68ede3aba71e7de4d6a4a8  libpsl-0.7.0.tar.gz
+752d4ba864c5c9e34dde4074f2071727  libpsl-0.12.0.tar.gz