From 86357162cb46054a7e24267a4ac02697fb74602be284363b899e5758f4224233 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 24 Nov 2016 11:11:20 +0000 Subject: [PATCH] Accepting request 441831 from home:AndreasStieger:branches:network:utilities break build cycle in libpsl OBS-URL: https://build.opensuse.org/request/show/441831 OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=16 --- libpsl.changes | 6 ----- libpsl.spec | 23 +++-------------- psl-make-dafsa.changes | 6 +++++ psl-make-dafsa.spec | 58 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 26 deletions(-) create mode 100644 psl-make-dafsa.changes create mode 100644 psl-make-dafsa.spec diff --git a/libpsl.changes b/libpsl.changes index 529121e..6d9ec59 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 22 22:37:35 UTC 2016 - astieger@suse.com - -- package psl-make-dafsa, for converting the PSL list into the - DAFSA binary format - ------------------------------------------------------------------- Mon Nov 14 15:26:42 UTC 2016 - astieger@suse.com diff --git a/libpsl.spec b/libpsl.spec index bdaa1ea..24f3cfa 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -87,19 +87,6 @@ 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 psl-make-dafsa -Summary: Create a binary DAFSA from a Public Suffix List -Group: Development/Tools/Other -Requires: python-base -BuildArch: noarch - -%description -n psl-make-dafsa -libpsl is capable of using a compact binary form of the Public Suffix List (PSL). -The format used is DAFSA, deterministic acyclic finate state automaton. - -The psl-make-dafsa converts ASCII string into C source or a binary format, -and is a build dependency for the publicsuffix package - %prep %setup -q @@ -118,7 +105,9 @@ make %{?_smp_mflags} %install make %{?_smp_mflags} DESTDIR=%{buildroot} install find %{buildroot} -type f -name "*.la" -delete -print -install src/psl-make-dafsa %{buildroot}%{_bindir} +# in psl-make-dafsa package to break build cycle +make DESTDIR=%{buildroot} install-man +rm %{buildroot}%{_mandir}/man1/psl-make-dafsa.1 %check make %{?_smp_mflags} check || (cat tests/test-suite.log; exit 42) @@ -147,10 +136,4 @@ make %{?_smp_mflags} check || (cat tests/test-suite.log; exit 42) %{_bindir}/psl %{_mandir}/man1/psl.1%{ext_man} -%files -n psl-make-dafsa -%defattr(-,root,root) -%doc AUTHORS NEWS COPYING -%{_bindir}/psl-make-dafsa -%{_mandir}/man1/psl-make-dafsa.1%{ext_man} - %changelog diff --git a/psl-make-dafsa.changes b/psl-make-dafsa.changes new file mode 100644 index 0000000..f7a78d8 --- /dev/null +++ b/psl-make-dafsa.changes @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Thu Nov 24 10:32:02 UTC 2016 - astieger@suse.com + +- package psl-make-dafsa, for converting the PSL list into the + DAFSA binary format +- split from libpsl package to break build cycle diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec new file mode 100644 index 0000000..7aedbda --- /dev/null +++ b/psl-make-dafsa.spec @@ -0,0 +1,58 @@ +# +# spec file for package psl-make-dafsa +# +# 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 +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: psl-make-dafsa +Version: 0.15.0 +Release: 0 +Summary: Create a binary DAFSA from a Public Suffix List +License: MIT +Group: Development/Libraries/C and C++ +Url: https://rockdaboot.github.io/libpsl +Source: https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz +Requires: python-base +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +psl-make-dafsa converts ASCII string into C source or a binary format, +The format used is DAFSA, deterministic acyclic finate state automaton. + +libpsl is capable of using this compact binary form of the Public Suffix List (PSL). + +This package is a build dependency for the publicsuffix package. + +%prep +%setup -q -n libpsl-%{version} + +%build + +%install +mkdir -p %{buildroot}%{_bindir} +install src/psl-make-dafsa %{buildroot}%{_bindir} +mkdir -p %{buildroot}%{_mandir}/man1 +install -m 644 src/psl-make-dafsa.1 %{buildroot}%{_mandir}/man1 + +%files +%defattr(-,root,root) +%defattr(-,root,root) +%doc AUTHORS NEWS COPYING +%{_bindir}/psl-make-dafsa +%{_mandir}/man1/psl-make-dafsa.1%{ext_man} + +%changelog