From 307b30a33dddceda323e1ac8c46a8f09f77ba48bb9fb6d46d1335a326cd6431a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 7 Apr 2021 09:40:22 +0000 Subject: [PATCH] - systemd.spec: clean some of the build deps up: - libpcre is redundant with libpcre2 (only required by the full build) and the mini variant needs none of them. Hence drop the ref to libpcre. - normally libidn2 is needed by some optional features in systemd-network (only). But it's implicitly pulled in by libgnutls (required by the main package). Let's make sure the related features won't be disabled inadvertently in the future by making the dep explicit. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1146 --- systemd-mini.changes | 15 +++++++++++++++ systemd-mini.spec | 2 +- systemd.changes | 15 +++++++++++++++ systemd.spec | 2 +- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index f2e3c48f..97fa4101 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 7 08:59:15 UTC 2021 - Franck Bui + +- systemd.spec: clean some of the build deps up: + + - libpcre is redundant with libpcre2 (only required by the full + build) and the mini variant needs none of them. Hence drop the ref + to libpcre. + + - normally libidn2 is needed by some optional features in + systemd-network (only). But it's implicitly pulled in by libgnutls + (required by the main package). Let's make sure the related + features won't be disabled inadvertently in the future by making + the dep explicit. + ------------------------------------------------------------------- Tue Mar 30 13:35:38 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index d2b08382..eeeba9ef 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -99,7 +99,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -BuildRequires: pkgconfig(libpcre) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -367,6 +366,7 @@ Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} +BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires diff --git a/systemd.changes b/systemd.changes index f2e3c48f..97fa4101 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 7 08:59:15 UTC 2021 - Franck Bui + +- systemd.spec: clean some of the build deps up: + + - libpcre is redundant with libpcre2 (only required by the full + build) and the mini variant needs none of them. Hence drop the ref + to libpcre. + + - normally libidn2 is needed by some optional features in + systemd-network (only). But it's implicitly pulled in by libgnutls + (required by the main package). Let's make sure the related + features won't be disabled inadvertently in the future by making + the dep explicit. + ------------------------------------------------------------------- Tue Mar 30 13:35:38 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 962abb8e..50f7c2b9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -97,7 +97,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -BuildRequires: pkgconfig(libpcre) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -365,6 +364,7 @@ Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} +BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires