- updated to 0.8.1, publicsuffix list from 20150827

- updated am patch

diff --git a/libpsl-am.patch b/libpsl-am.patch
index a485cbf2e13e3ae2bb7a5300309bd16b6cf1553b..f31d0ce5cc3e9d5d8735bde954f759565d9dc8d3 100644 (file)
--- a/libpsl-am.patch
+++ b/libpsl-am.patch
@@ -1,32 +1,10 @@
---- libpsl-libpsl-0.7.1/Makefile.am.orig       2015-03-02 18:19:48.641096106 +0100
-+++ libpsl-libpsl-0.7.1/Makefile.am    2015-03-02 18:25:10.937749247 +0100
+--- libpsl-libpsl-0.8.1/Makefile.am.orig       2015-09-06 13:41:57.403162943 +0200
++++ libpsl-libpsl-0.8.1/Makefile.am    2015-09-06 13:42:53.456493926 +0200
 @@ -1,6 +1,7 @@
  # got some hints from https://gitorious.org/openismus-playground/examplelib/source
  
- SUBDIRS = po include src tools data $(LIBPSL_DOCS) tests
+ SUBDIRS = po include src tools $(LIBPSL_DOCS) tests
 +DIST_SUBDIRS = docs/libpsl
  
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
---- libpsl-libpsl-0.7.1/configure.ac.orig      2015-03-02 18:25:55.964414025 +0100
-+++ libpsl-libpsl-0.7.1/configure.ac   2015-03-02 20:20:44.577458269 +0100
-@@ -37,8 +37,6 @@
- ])
- 
- if test x"$have_gtk_doc" = xyes -a x"$enable_gtk_doc" = xyes; then
--  docdir_makefile=docs/libpsl/Makefile
--  docdir_version_xml=docs/libpsl/version.xml
-   AC_SUBST([LIBPSL_DOCS], [docs/libpsl])
- fi
- 
-@@ -253,8 +251,8 @@
-                  src/Makefile
-                  tools/Makefile
-                  po/Makefile.in
--                 ${docdir_makefile}
--                 ${docdir_version_xml}
-+                 docs/libpsl/Makefile
-+                 docs/libpsl/version.xml
-                  data/Makefile
-                  tests/Makefile
-                  libpsl.pc:libpsl.pc.in])

diff --git a/libpsl.spec b/libpsl.spec
index 93579476c85923a8bac01f02300a2d65f0a323c4..ae51b485cb29727cf003960e5d959079da07302c 100644 (file)
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -5,12 +5,16 @@
 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.7.1
-Release:       2
+Version:       0.8.1
+Release:       1
 License:       MIT
 Group:         Networking
 Source0:       https://github.com/rockdaboot/libpsl/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 953eb964a5c95c42246558cafc812607
+# Source0-md5: 515060957760ed78d5bd5a87f424b5d5
+%define        psl_ref 1fc1ed365818a6a77d6f31d425ff03ca54cdc7f3
+%define        psldate 20150827
+Source1:       https://github.com/publicsuffix/list/archive/%{psl_ref}/publicsuffix_list-%{psldate}.tar.gz
+# Source1-md5: ee9a591d4545d9f6ca350bd9df2c2e51
 Patch0:                %{name}-am.patch
 URL:           https://rockdaboot.github.io/libpsl
 BuildRequires: autoconf >= 2.59
@@ -128,6 +132,10 @@ ciasteczka jest akceptowalna dla domen itp.
 %setup -q -n %{name}-%{name}-%{version}
 %patch0 -p1
 
+rmdir list
+%{__tar} xf %{SOURCE1}
+%{__mv} list-%{psl_ref} list
+
 # gettextize workaround
 %{__sed} -i -e 's,po/Makefile\.in,,' configure.ac
 
@@ -156,7 +164,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/libpsl/test_psl.txt
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libpsl.la
 
@@ -178,7 +185,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libpsl.h
 %{_pkgconfigdir}/libpsl.pc
 %{_mandir}/man3/libpsl.3*
-%{_datadir}/%{name}
 
 %files static
 %defattr(644,root,root,755)