diff --git a/0001-Remove-include-of-bits-stat.h.patch b/0001-Remove-include-of-bits-stat.h.patch deleted file mode 100644 index 8a74548..0000000 --- a/0001-Remove-include-of-bits-stat.h.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dbefdb67678d0774c352aebe4eb37e526c280a3e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim=20R=C3=BChsen?= -Date: Thu, 19 Nov 2015 10:06:04 +0100 -Subject: [PATCH] Remove include of bits/stat.h - ---- - src/psl.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/psl.c b/src/psl.c -index 486da89..ed14a19 100644 ---- a/src/psl.c -+++ b/src/psl.c -@@ -87,7 +87,6 @@ - #endif - - #include --#include - - /* number of elements within an array */ - #define countof(a) (sizeof(a)/sizeof(*(a))) --- -2.1.4 - diff --git a/libpsl-0.11.0.tar.gz b/libpsl-0.11.0.tar.gz deleted file mode 100644 index 4f6eb65..0000000 --- a/libpsl-0.11.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b410e840db64cf5748e9774a8effbb4f22be3168afe8f43d78d05607d536bd55 -size 516299 diff --git a/libpsl-0.12.0.tar.gz b/libpsl-0.12.0.tar.gz new file mode 100644 index 0000000..cd13e51 --- /dev/null +++ b/libpsl-0.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67ad326f8258bd599de2392e08027152dcc52a4d0cf510f4bdc95e85d5de49c7 +size 532662 diff --git a/libpsl.changes b/libpsl.changes index c6eec2d..6354e82 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 7 22:28:27 UTC 2016 - astieger@suse.com + +- libpsl 0.12.0 (libpsl.so.5 5:0:0) + * Remove psl_builtin_compile_time() + * Add function psl_is_public_suffix2() + * Avoid libicu dependency with --enable-runtime=no +- drop upstreamed 0001-Remove-include-of-bits-stat.h.patch + ------------------------------------------------------------------- Sat Nov 28 14:06:39 UTC 2015 - astieger@suse.com diff --git a/libpsl.spec b/libpsl.spec index e531992..67b29ee 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -1,7 +1,7 @@ # # spec file for package libpsl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 rpm@cicku.me # # All modifications and additions to the file contributed by third parties @@ -17,17 +17,18 @@ # +%define somajor 5 Name: libpsl -Version: 0.11.0 +Version: 0.12.0 Release: 0 Summary: C library for the Publix Suffix List License: MIT Group: Development/Libraries/C and C++ Url: https://rockdaboot.github.io/libpsl Source0: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch0: 0001-Remove-include-of-bits-stat.h.patch BuildRequires: pkg-config >= 0.9.0 BuildRequires: publicsuffix +BuildRequires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version} > 1110 BuildRequires: libicu-devel @@ -44,11 +45,11 @@ HTTP user agents can use it to avoid privacy-leaking "supercookies" and "super domain" certificates. It is also use do highlight domain parts in a user interface and sorting domain lists by site. -%package -n %{name}0 +%package -n %{name}%{somajor} Summary: C library for the Publix Suffix List Group: System/Libraries -%description -n %{name}0 +%description -n %{name}%{somajor} libpsl is a C library to handle the Public Suffix List. A "public suffix" is a domain name under which Internet users can directly register own names. @@ -59,7 +60,7 @@ and sorting domain lists by site. %package devel Summary: Development files for %{name} Group: Development/Libraries/C and C++ -Requires: %{name}0 = %{version} +Requires: %{name}%{somajor} = %{version} Requires: publicsuffix %description devel @@ -87,7 +88,6 @@ and sorting domain lists by site. %prep %setup -q -%patch0 -p1 %build %configure \ @@ -109,14 +109,14 @@ find %{buildroot} -type f -name "*.la" -delete -print %check make %{?_smp_mflags} check || cat tests/test-suite.log -%post -n %{name}0 -p /sbin/ldconfig +%post -n %{name}%{somajor} -p /sbin/ldconfig -%postun -n %{name}0 -p /sbin/ldconfig +%postun -n %{name}%{somajor} -p /sbin/ldconfig -%files -n %{name}0 +%files -n %{name}%{somajor} %defattr(-,root,root) %doc COPYING -%{_libdir}/libpsl.so.* +%{_libdir}/libpsl.so.%{somajor}* %files devel %defattr(-,root,root)