From e3ac2db7a1f56829a7f416944a86188f96da1e1e0cfe5b543a39a8e43ad95751 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 20 May 2021 08:04:53 +0000 Subject: [PATCH] - Spec file minor cleanups: - Drop all "Group:" tags as they are deprecated. - Drop "License:" tags from all all subpackages and make it inherited from the main package. - Drop "%bcond_with parentpathid" as it's not used. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1156 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 40 ---------------------------------------- systemd.changes | 12 ++++++++++++ systemd.spec | 40 ---------------------------------------- 4 files changed, 24 insertions(+), 80 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index cc9f7913..a3059ed6 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 19 06:54:57 UTC 2021 - Franck Bui + +- Spec file minor cleanups: + + - Drop all "Group:" tags as they are deprecated. + + - Drop "License:" tags from all all subpackages and make it + inherited from the main package. + + - Drop "%bcond_with parentpathid" as it's not used. + ------------------------------------------------------------------- Tue May 18 18:31:20 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 31ba396b..f41887a1 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -55,7 +55,6 @@ %bcond_without experimental %bcond_without tests %endif -%bcond_with parentpathid Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd @@ -63,7 +62,6 @@ Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -208,8 +206,6 @@ drop-in replacement for sysvinit. %if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd -License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -220,8 +216,6 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd -License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -233,8 +227,6 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -246,8 +238,6 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd -License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -276,8 +266,6 @@ This library provides several of the systemd C APIs: %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager -License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires: group(kvm) @@ -309,8 +297,6 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information -License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -324,8 +310,6 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev -License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -340,8 +324,6 @@ dynamic library, which provides access to udev device information. %if %{with coredump} %package coredump Summary: Systemd tools for coredump management -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -354,8 +336,6 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -372,8 +352,6 @@ and systemd-importd. %if %{with networkd} || %{with resolved} %package network Summary: Systemd tools for networkd and resolved -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) @@ -391,8 +369,6 @@ resolver tools for resolved %if %{with portabled} %package portable Summary: Systemd tools for portable services -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -411,8 +387,6 @@ https://systemd.io/PORTABLE_SERVICES %if ! 0%{?bootstrap} %package logger Summary: Journal only logging -License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -423,8 +397,6 @@ This package marks the installation to not use syslog but only the journal. %package -n nss-systemd Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -436,8 +408,6 @@ To activate this NSS module, you will need to include it in %package -n nss-myhostname Summary: Plugin for local system host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -453,8 +423,6 @@ To activate this NSS module, you will need to include it in %if %{with resolved} %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -470,8 +438,6 @@ To activate this NSS module, you will need to include it in %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -487,8 +453,6 @@ To activate this NSS module, you will need to include it in %if %{with journal_remote} %package journal-remote Summary: Gateway for serving journal events over the network using HTTP -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -505,8 +469,6 @@ systemd-journal-remote, and systemd-journal-upload. %if %{with tests} %package tests Summary: Unit tests for systemd -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama @@ -524,8 +486,6 @@ to run all unit tests at once. %if %{with experimental} %package experimental Summary: Experimental systemd features -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 diff --git a/systemd.changes b/systemd.changes index cc9f7913..a3059ed6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed May 19 06:54:57 UTC 2021 - Franck Bui + +- Spec file minor cleanups: + + - Drop all "Group:" tags as they are deprecated. + + - Drop "License:" tags from all all subpackages and make it + inherited from the main package. + + - Drop "%bcond_with parentpathid" as it's not used. + ------------------------------------------------------------------- Tue May 18 18:31:20 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 08e0e32b..2d82b0be 100644 --- a/systemd.spec +++ b/systemd.spec @@ -53,7 +53,6 @@ %bcond_without experimental %bcond_without tests %endif -%bcond_with parentpathid Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd @@ -61,7 +60,6 @@ Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -206,8 +204,6 @@ drop-in replacement for sysvinit. %if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd -License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -218,8 +214,6 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd -License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -231,8 +225,6 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -244,8 +236,6 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd -License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -274,8 +264,6 @@ This library provides several of the systemd C APIs: %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager -License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires: group(kvm) @@ -307,8 +295,6 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information -License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -322,8 +308,6 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev -License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -338,8 +322,6 @@ dynamic library, which provides access to udev device information. %if %{with coredump} %package coredump Summary: Systemd tools for coredump management -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -352,8 +334,6 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -370,8 +350,6 @@ and systemd-importd. %if %{with networkd} || %{with resolved} %package network Summary: Systemd tools for networkd and resolved -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) @@ -389,8 +367,6 @@ resolver tools for resolved %if %{with portabled} %package portable Summary: Systemd tools for portable services -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -409,8 +385,6 @@ https://systemd.io/PORTABLE_SERVICES %if ! 0%{?bootstrap} %package logger Summary: Journal only logging -License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -421,8 +395,6 @@ This package marks the installation to not use syslog but only the journal. %package -n nss-systemd Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -434,8 +406,6 @@ To activate this NSS module, you will need to include it in %package -n nss-myhostname Summary: Plugin for local system host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -451,8 +421,6 @@ To activate this NSS module, you will need to include it in %if %{with resolved} %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -468,8 +436,6 @@ To activate this NSS module, you will need to include it in %if %{with machined} %package -n nss-mymachines Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -485,8 +451,6 @@ To activate this NSS module, you will need to include it in %if %{with journal_remote} %package journal-remote Summary: Gateway for serving journal events over the network using HTTP -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -503,8 +467,6 @@ systemd-journal-remote, and systemd-journal-upload. %if %{with tests} %package tests Summary: Unit tests for systemd -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama @@ -522,8 +484,6 @@ to run all unit tests at once. %if %{with experimental} %package experimental Summary: Experimental systemd features -License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2