From ec04e1c4d658503c33c92bd4485e9bc5069654fd1853e85260754b9e05513300 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 14 Dec 2016 21:23:12 +0000 Subject: [PATCH 1/5] Accepting request 446220 from home:AndreasStieger:branches:network:utilities libpsl 0.16.0 OBS-URL: https://build.opensuse.org/request/show/446220 OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=18 --- libpsl-0.15.0.tar.gz | 3 -- libpsl-0.16.0-fix-SO-version.patch | 26 ++++++++++++ libpsl-0.16.0.tar.gz | 3 ++ libpsl-0.16.0.tar.gz.asc | 16 ++++++++ libpsl.changes | 16 +++++++- libpsl.keyring | 63 ++++++++++++++++++++++++++++++ libpsl.spec | 15 ++++++- psl-make-dafsa.changes | 6 +++ psl-make-dafsa.keyring | 63 ++++++++++++++++++++++++++++++ psl-make-dafsa.spec | 3 +- 10 files changed, 207 insertions(+), 7 deletions(-) delete mode 100644 libpsl-0.15.0.tar.gz create mode 100644 libpsl-0.16.0-fix-SO-version.patch create mode 100644 libpsl-0.16.0.tar.gz create mode 100644 libpsl-0.16.0.tar.gz.asc create mode 100644 libpsl.keyring create mode 100644 psl-make-dafsa.keyring diff --git a/libpsl-0.15.0.tar.gz b/libpsl-0.15.0.tar.gz deleted file mode 100644 index b8df77a..0000000 --- a/libpsl-0.15.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5946355d810fe03adc4194f1b5afe861547288c2ddba24bd3aa39a8f188a972 -size 568878 diff --git a/libpsl-0.16.0-fix-SO-version.patch b/libpsl-0.16.0-fix-SO-version.patch new file mode 100644 index 0000000..9858ec7 --- /dev/null +++ b/libpsl-0.16.0-fix-SO-version.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Tim_R=C3=BChsen?= +Date: Mon, 12 Dec 2016 20:56:51 +0100 +Subject: Patch SO version to 6:0:1 + +This was discussed on the libpsl mailing list; the age should not have +been set to 0 because no existing interfaces were removed or changed +in an API-breaking way. + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + +diff --git a/configure.ac b/configure.ac +index 2ad1d45..06d64e7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -88,7 +88,7 @@ PKG_PROG_PKG_CONFIG + # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. + # 5. If any interfaces have been added since the last public release, then increment age. + # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. +-AC_SUBST([LIBPSL_SO_VERSION], [6:0:0]) ++AC_SUBST([LIBPSL_SO_VERSION], [6:0:1]) + AC_SUBST([LIBPSL_VERSION], $VERSION) + + # Check for enable/disable builtin PSL data diff --git a/libpsl-0.16.0.tar.gz b/libpsl-0.16.0.tar.gz new file mode 100644 index 0000000..6769e00 --- /dev/null +++ b/libpsl-0.16.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:714b4ba40621274b4f88b26fe946fec7996eb5363f9566f4b387003f6ce610be +size 568341 diff --git a/libpsl-0.16.0.tar.gz.asc b/libpsl-0.16.0.tar.gz.asc new file mode 100644 index 0000000..b46c81f --- /dev/null +++ b/libpsl-0.16.0.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEHLJ9vJhhSy1YQWRtCDAttqJnBCgFAlhMQNEACgkQCDAttqJn +BChx5hAAw+ywXjkLtQdvAYA5m8DvZirz3w2v3ixNTkPMTAGjx7mxyvx4waJ5cxRu +rQl6aXzUOBhw6+M41WJ5lZj7FAEuYRU9vLf1yDnNG9ZZjDF9VdjSn3x3R+ydj8j2 +Jq8U8yxhSFCfyi5mAXWaMZfRkWafHgf1en3N6iJFdz2ikVfvis//zdlmLTI1VZH7 +TUjMpkDbXy5Yt/78XFjw6bjIln9BGaIwCuGSxNC8D9uuogJ8zxzYTCrcEeX0hHtG +rpC5WQNVmWCdlsebVHu9irxw6K7Lm7SzIYU2rJAfP7o0CNLo4pNiQAYEKAXLzDRx +zJIswkxABWQtR5pSWpzdprCdCfjxUDJ6/Y9nw35OfQrGJ7yUQbMMfj9s2ibKc9vm +WWvzDVyWM8SgaTMvT9FWMG7sTrH/mHOEkMusOYDow/WeqjW1j49EdXwgQqwKb0G9 +9n+M9qQb6QEs2UCuoleafZM7Tyq4atyQIM0FoCizs+bj6717bmmokeKOsjTfa7Tx +71Abfy8UCgHPipREA1MXxCOrVoDi+k2ggIdYLCx71lQxqXxOTQMQmKW7Q2qBRKVL +lkPQ75mal3DY2PWzZec9aIdRSeMx7cOIAyFzkwcWvG9lKQl56q10O6MYUGuP+ZPI +0o2qYL2P/MDqveBnvcqRj9zSRbOG9gKoVMUDwKAt8iyQTn3YTGU= +=4cqf +-----END PGP SIGNATURE----- diff --git a/libpsl.changes b/libpsl.changes index 6d9ec59..8349ce2 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -1,7 +1,21 @@ +------------------------------------------------------------------- +Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com + +- libpsl 0.16.0: + This version enables consumers of the library to dynamically load + the latest public suffix data from a binary data file in the + publicsuffix package which can then updated without re-building + libpsl. + * Add functions psl_latest() and psl_dist_filename() + * Do not taint out variable on error in psl_str_to_utf8lower() + * Replace psl2c by psl-make-dafsa +- correct soname change, add libpsl-0.16.0-fix-SO-version.patch +- add upstream signing key + ------------------------------------------------------------------- Mon Nov 14 15:26:42 UTC 2016 - astieger@suse.com -- lipsl 0.15.0: +- libpsl 0.15.0: * Python3 compatibility for psl-make-dafsa * Support for UTF-8 in DAFSA data * Skip punycode conversion if DAFSA has UTF-8 diff --git a/libpsl.keyring b/libpsl.keyring new file mode 100644 index 0000000..ef37cc3 --- /dev/null +++ b/libpsl.keyring @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +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 +=3GzB +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libpsl.spec b/libpsl.spec index 24f3cfa..d127ab4 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -19,17 +19,24 @@ %define somajor 5 Name: libpsl -Version: 0.15.0 +Version: 0.16.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 Source: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz +Source2: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc Source1000: baselibs.conf +Patch1: libpsl-0.16.0-fix-SO-version.patch +# for libpsl-0.16.0-fix-SO-version.patch +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool BuildRequires: pkgconfig >= 0.9.0 BuildRequires: publicsuffix BuildRequires: python-base >= 2.7 +# BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version} > 1110 BuildRequires: libicu-devel @@ -89,8 +96,11 @@ and sorting domain lists by site. %prep %setup -q +%patch1 -p1 %build +# for libpsl-0.16.0-fix-SO-version.patch +autoreconf -fiv %configure \ --disable-silent-rules \ --disable-static \ @@ -98,7 +108,8 @@ and sorting domain lists by site. --disable-runtime \ --disable-builtin \ %endif - --with-psl-file=%{_datadir}/publicsuffix/public_suffix_list.dat + --with-psl-file=%{_datadir}/publicsuffix/public_suffix_list.dat \ + --with-psl-distfile=%{_datadir}/publicsuffix/public_suffix_list.dafsa make %{?_smp_mflags} diff --git a/psl-make-dafsa.changes b/psl-make-dafsa.changes index f7a78d8..b21880b 100644 --- a/psl-make-dafsa.changes +++ b/psl-make-dafsa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com + +- update to 0.16.0: + * no changes for psl-make-dafsa + ------------------------------------------------------------------- Thu Nov 24 10:32:02 UTC 2016 - astieger@suse.com diff --git a/psl-make-dafsa.keyring b/psl-make-dafsa.keyring new file mode 100644 index 0000000..ef37cc3 --- /dev/null +++ b/psl-make-dafsa.keyring @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +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 +=3GzB +-----END PGP PUBLIC KEY BLOCK----- diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec index 7aedbda..e2af7c7 100644 --- a/psl-make-dafsa.spec +++ b/psl-make-dafsa.spec @@ -18,13 +18,14 @@ Name: psl-make-dafsa -Version: 0.15.0 +Version: 0.16.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 +Source2: https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz.asc Requires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From c0eb98dfa54efe3bad6273370676ace81be6ac3860e9393640ea9356c95bb9b9 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 14 Dec 2016 21:38:01 +0000 Subject: [PATCH 2/5] add keyring OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=19 --- libpsl.spec | 1 + psl-make-dafsa.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/libpsl.spec b/libpsl.spec index d127ab4..703e771 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -27,6 +27,7 @@ Group: Development/Libraries/C and C++ Url: https://rockdaboot.github.io/libpsl Source: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source2: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc +Source3: %{name}.keyring Source1000: baselibs.conf Patch1: libpsl-0.16.0-fix-SO-version.patch # for libpsl-0.16.0-fix-SO-version.patch diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec index e2af7c7..7fde267 100644 --- a/psl-make-dafsa.spec +++ b/psl-make-dafsa.spec @@ -26,6 +26,7 @@ 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 Source2: https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz.asc +Source3: %{name}.keyring Requires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch From c4312d04204bd3c8f90a22e0164a3593470f2f3b5bb782654eb6fb8649be39ca Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Wed, 14 Dec 2016 22:19:26 +0000 Subject: [PATCH 3/5] - package HTML docs in -devel package OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=20 --- libpsl.changes | 1 + libpsl.spec | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libpsl.changes b/libpsl.changes index 8349ce2..ae31231 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -11,6 +11,7 @@ Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com * Replace psl2c by psl-make-dafsa - correct soname change, add libpsl-0.16.0-fix-SO-version.patch - add upstream signing key +- package HTML docs in -devel package ------------------------------------------------------------------- Mon Nov 14 15:26:42 UTC 2016 - astieger@suse.com diff --git a/libpsl.spec b/libpsl.spec index 703e771..2635c38 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -81,6 +81,7 @@ domain" certificates. It is also use do highlight domain parts in a user interfa and sorting domain lists by site. This package contains libraries and header files. +Developer documentation is in %{_docdir}/libpsl-devel/html . %package -n psl Summary: Commandline utility to explore the Public Suffix List @@ -135,6 +136,7 @@ make %{?_smp_mflags} check || (cat tests/test-suite.log; exit 42) %files devel %defattr(-,root,root) %doc AUTHORS NEWS COPYING +%doc docs/libpsl/html %{_includedir}/libpsl.h %{_libdir}/libpsl.so %{_libdir}/pkgconfig/libpsl.pc From 9678df5038dac94b0754a4746b60140b012d9e25e8d9ba718c616c98ae877808 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 15 Dec 2016 13:39:44 +0000 Subject: [PATCH 4/5] - libpsl 0.16.1: OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=21 --- libpsl-0.16.0-fix-SO-version.patch | 26 ------------ libpsl-0.16.0.tar.gz | 3 -- libpsl-0.16.0.tar.gz.asc | 16 -------- libpsl-0.16.1.tar.gz | 3 ++ libpsl.changes | 7 ++-- libpsl.keyring | 63 ------------------------------ libpsl.spec | 18 +++------ psl-make-dafsa.changes | 4 +- psl-make-dafsa.keyring | 63 ------------------------------ psl-make-dafsa.spec | 9 ++--- 10 files changed, 17 insertions(+), 195 deletions(-) delete mode 100644 libpsl-0.16.0-fix-SO-version.patch delete mode 100644 libpsl-0.16.0.tar.gz delete mode 100644 libpsl-0.16.0.tar.gz.asc create mode 100644 libpsl-0.16.1.tar.gz delete mode 100644 libpsl.keyring delete mode 100644 psl-make-dafsa.keyring diff --git a/libpsl-0.16.0-fix-SO-version.patch b/libpsl-0.16.0-fix-SO-version.patch deleted file mode 100644 index 9858ec7..0000000 --- a/libpsl-0.16.0-fix-SO-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: =?utf-8?q?Tim_R=C3=BChsen?= -Date: Mon, 12 Dec 2016 20:56:51 +0100 -Subject: Patch SO version to 6:0:1 - -This was discussed on the libpsl mailing list; the age should not have -been set to 0 because no existing interfaces were removed or changed -in an API-breaking way. - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - -diff --git a/configure.ac b/configure.ac -index 2ad1d45..06d64e7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,7 +88,7 @@ PKG_PROG_PKG_CONFIG - # 4. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0. - # 5. If any interfaces have been added since the last public release, then increment age. - # 6. If any existing interfaces have been removed or changed since the last public release, then set age to 0. --AC_SUBST([LIBPSL_SO_VERSION], [6:0:0]) -+AC_SUBST([LIBPSL_SO_VERSION], [6:0:1]) - AC_SUBST([LIBPSL_VERSION], $VERSION) - - # Check for enable/disable builtin PSL data diff --git a/libpsl-0.16.0.tar.gz b/libpsl-0.16.0.tar.gz deleted file mode 100644 index 6769e00..0000000 --- a/libpsl-0.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:714b4ba40621274b4f88b26fe946fec7996eb5363f9566f4b387003f6ce610be -size 568341 diff --git a/libpsl-0.16.0.tar.gz.asc b/libpsl-0.16.0.tar.gz.asc deleted file mode 100644 index b46c81f..0000000 --- a/libpsl-0.16.0.tar.gz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEHLJ9vJhhSy1YQWRtCDAttqJnBCgFAlhMQNEACgkQCDAttqJn -BChx5hAAw+ywXjkLtQdvAYA5m8DvZirz3w2v3ixNTkPMTAGjx7mxyvx4waJ5cxRu -rQl6aXzUOBhw6+M41WJ5lZj7FAEuYRU9vLf1yDnNG9ZZjDF9VdjSn3x3R+ydj8j2 -Jq8U8yxhSFCfyi5mAXWaMZfRkWafHgf1en3N6iJFdz2ikVfvis//zdlmLTI1VZH7 -TUjMpkDbXy5Yt/78XFjw6bjIln9BGaIwCuGSxNC8D9uuogJ8zxzYTCrcEeX0hHtG -rpC5WQNVmWCdlsebVHu9irxw6K7Lm7SzIYU2rJAfP7o0CNLo4pNiQAYEKAXLzDRx -zJIswkxABWQtR5pSWpzdprCdCfjxUDJ6/Y9nw35OfQrGJ7yUQbMMfj9s2ibKc9vm -WWvzDVyWM8SgaTMvT9FWMG7sTrH/mHOEkMusOYDow/WeqjW1j49EdXwgQqwKb0G9 -9n+M9qQb6QEs2UCuoleafZM7Tyq4atyQIM0FoCizs+bj6717bmmokeKOsjTfa7Tx -71Abfy8UCgHPipREA1MXxCOrVoDi+k2ggIdYLCx71lQxqXxOTQMQmKW7Q2qBRKVL -lkPQ75mal3DY2PWzZec9aIdRSeMx7cOIAyFzkwcWvG9lKQl56q10O6MYUGuP+ZPI -0o2qYL2P/MDqveBnvcqRj9zSRbOG9gKoVMUDwKAt8iyQTn3YTGU= -=4cqf ------END PGP SIGNATURE----- diff --git a/libpsl-0.16.1.tar.gz b/libpsl-0.16.1.tar.gz new file mode 100644 index 0000000..015a0f0 --- /dev/null +++ b/libpsl-0.16.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1420371ca593680a4971683506b24a94a17b1efe19028ce8ebe5a6ef236839eb +size 566796 diff --git a/libpsl.changes b/libpsl.changes index ae31231..f1ec62d 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com +Thu Dec 15 12:18:33 UTC 2016 - astieger@suse.com -- libpsl 0.16.0: +- libpsl 0.16.1: This version enables consumers of the library to dynamically load the latest public suffix data from a binary data file in the publicsuffix package which can then updated without re-building @@ -9,8 +9,7 @@ Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com * Add functions psl_latest() and psl_dist_filename() * Do not taint out variable on error in psl_str_to_utf8lower() * Replace psl2c by psl-make-dafsa -- correct soname change, add libpsl-0.16.0-fix-SO-version.patch -- add upstream signing key +- correct licenses for package and subpackages - package HTML docs in -devel package ------------------------------------------------------------------- diff --git a/libpsl.keyring b/libpsl.keyring deleted file mode 100644 index ef37cc3..0000000 --- a/libpsl.keyring +++ /dev/null @@ -1,63 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -=3GzB ------END PGP PUBLIC KEY BLOCK----- diff --git a/libpsl.spec b/libpsl.spec index 2635c38..0a79ac8 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -19,21 +19,14 @@ %define somajor 5 Name: libpsl -Version: 0.16.0 +Version: 0.16.1 Release: 0 Summary: C library for the Publix Suffix List -License: MIT +License: MIT and MPL-2.0 and BSD-3-Clause Group: Development/Libraries/C and C++ Url: https://rockdaboot.github.io/libpsl Source: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -Source2: https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz.asc -Source3: %{name}.keyring Source1000: baselibs.conf -Patch1: libpsl-0.16.0-fix-SO-version.patch -# for libpsl-0.16.0-fix-SO-version.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libtool BuildRequires: pkgconfig >= 0.9.0 BuildRequires: publicsuffix BuildRequires: python-base >= 2.7 @@ -56,7 +49,9 @@ and sorting domain lists by site. %package -n %{name}%{somajor} Summary: C library for the Publix Suffix List +License: MIT and MPL-2.0 Group: System/Libraries +# The libary code is MIT, with built-in data from publicsuffix Recommends: publicsuffix %description -n %{name}%{somajor} @@ -69,6 +64,7 @@ and sorting domain lists by site. %package devel Summary: Development files for %{name} +License: MIT Group: Development/Libraries/C and C++ Requires: %{name}%{somajor} = %{version} @@ -85,6 +81,7 @@ Developer documentation is in %{_docdir}/libpsl-devel/html . %package -n psl Summary: Commandline utility to explore the Public Suffix List +License: MIT Group: Productivity/Networking/Other %description -n psl @@ -98,11 +95,8 @@ and sorting domain lists by site. %prep %setup -q -%patch1 -p1 %build -# for libpsl-0.16.0-fix-SO-version.patch -autoreconf -fiv %configure \ --disable-silent-rules \ --disable-static \ diff --git a/psl-make-dafsa.changes b/psl-make-dafsa.changes index b21880b..a242df5 100644 --- a/psl-make-dafsa.changes +++ b/psl-make-dafsa.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Wed Dec 14 20:54:07 UTC 2016 - astieger@suse.com +Thu Dec 15 12:18:33 UTC 2016 - astieger@suse.com -- update to 0.16.0: +- update to 0.16.1: * no changes for psl-make-dafsa ------------------------------------------------------------------- diff --git a/psl-make-dafsa.keyring b/psl-make-dafsa.keyring deleted file mode 100644 index ef37cc3..0000000 --- a/psl-make-dafsa.keyring +++ /dev/null @@ -1,63 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2 - -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 -=3GzB ------END PGP PUBLIC KEY BLOCK----- diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec index 7fde267..9c0b8a5 100644 --- a/psl-make-dafsa.spec +++ b/psl-make-dafsa.spec @@ -18,15 +18,13 @@ Name: psl-make-dafsa -Version: 0.16.0 +Version: 0.16.1 Release: 0 Summary: Create a binary DAFSA from a Public Suffix List -License: MIT +License: BSD-3-Clause 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 -Source2: https://github.com/rockdaboot/libpsl/releases/download/libpsl-%{version}/libpsl-%{version}.tar.gz.asc -Source3: %{name}.keyring Requires: python-base BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -52,8 +50,7 @@ install -m 644 src/psl-make-dafsa.1 %{buildroot}%{_mandir}/man1 %files %defattr(-,root,root) -%defattr(-,root,root) -%doc AUTHORS NEWS COPYING +%doc AUTHORS NEWS src/LICENSE.chromium %{_bindir}/psl-make-dafsa %{_mandir}/man1/psl-make-dafsa.1%{ext_man} From 04ac284c5e1555be727ad0fe16539f5d6c1ff99558515febbf36d9e8f9134d9a Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Thu, 15 Dec 2016 13:46:51 +0000 Subject: [PATCH 5/5] clean OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=22 --- libpsl.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/libpsl.spec b/libpsl.spec index 0a79ac8..8af8692 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -30,7 +30,6 @@ Source1000: baselibs.conf BuildRequires: pkgconfig >= 0.9.0 BuildRequires: publicsuffix BuildRequires: python-base >= 2.7 -# BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{?suse_version} > 1110 BuildRequires: libicu-devel