From 297908ce48c1bbf39d1a7e135aa112facfae26fbfb17f9eaf33311d358943931 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Thu, 9 Nov 2017 13:54:17 +0000 Subject: [PATCH] Accepting request 539550 from home:pluskalm:branches:network:utilities - Explicitly require python2 - Cleanup with spec-cleaner - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/539550 OBS-URL: https://build.opensuse.org/package/show/network:utilities/libpsl?expand=0&rev=31 --- libpsl.changes | 6 ++++++ libpsl.spec | 7 +------ psl-make-dafsa.changes | 5 +++++ psl-make-dafsa.spec | 2 -- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libpsl.changes b/libpsl.changes index e7e34bd..ec9077f 100644 --- a/libpsl.changes +++ b/libpsl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 7 13:29:05 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2 +- Cleanup with spec-cleaner + ------------------------------------------------------------------- Thu Jul 20 13:48:27 UTC 2017 - astieger@suse.com diff --git a/libpsl.spec b/libpsl.spec index 681cc1c..930b2b2 100644 --- a/libpsl.spec +++ b/libpsl.spec @@ -31,7 +31,7 @@ BuildRequires: libidn2-devel >= 0.14 BuildRequires: libunistring-devel BuildRequires: pkgconfig >= 0.9.0 BuildRequires: publicsuffix -BuildRequires: python-base >= 2.7 +BuildRequires: python2-base >= 2.7 %if %{with gtk-doc} BuildRequires: gtk-doc >= 1.15 %endif @@ -100,13 +100,8 @@ and sorting domain lists by site. %configure \ --disable-silent-rules \ --disable-static \ -%if 0%{?suse_version} <= 1110 - --disable-runtime \ - --disable-builtin \ -%endif --with-psl-file=%{_datadir}/publicsuffix/public_suffix_list.dat \ --with-psl-distfile=%{_datadir}/publicsuffix/public_suffix_list.dafsa - make %{?_smp_mflags} %install diff --git a/psl-make-dafsa.changes b/psl-make-dafsa.changes index 17809ec..28a34ae 100644 --- a/psl-make-dafsa.changes +++ b/psl-make-dafsa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 7 13:29:56 UTC 2017 - mpluskal@suse.com + +- Run spec-cleaner + ------------------------------------------------------------------- Thu Jul 20 13:48:27 UTC 2017 - astieger@suse.com diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec index 479b4b9..ac46835 100644 --- a/psl-make-dafsa.spec +++ b/psl-make-dafsa.spec @@ -26,7 +26,6 @@ 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 @@ -49,7 +48,6 @@ mkdir -p %{buildroot}%{_mandir}/man1 install -m 644 src/psl-make-dafsa.1 %{buildroot}%{_mandir}/man1 %files -%defattr(-,root,root) %doc AUTHORS NEWS src/LICENSE.chromium %{_bindir}/psl-make-dafsa %{_mandir}/man1/psl-make-dafsa.1%{ext_man}