diff --git a/systemd-mini.changes b/systemd-mini.changes index b0462bb8..bb539039 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 20 18:52:53 UTC 2021 - Franck Bui + +- Restore all "License:" tags + + udev uses a different license (GPL-2.0-only) than the main package + and "osc service localrun format_spec_file" has the good taste to + restore the license tags for all other subpackages if one of the + subpackage tag differs. + ------------------------------------------------------------------- Thu May 20 15:47:38 UTC 2021 - Franck Bui @@ -10,8 +20,8 @@ Wed May 19 06:54:57 UTC 2021 - Franck Bui - Drop all "Group:" tags as they are deprecated. - - Drop "License:" tags from all all subpackages and make it - inherited from the main package. + - Drop "License:" tags from all subpackages and make it inherited + from the main package. - Drop "%bcond_with parentpathid" as it's not used. diff --git a/systemd-mini.spec b/systemd-mini.spec index f03272d4..56c04a28 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -206,6 +206,7 @@ drop-in replacement for sysvinit. %if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd +License: LGPL-2.1-or-later Supplements: (systemd and patterns-base-documentation) %description doc @@ -216,6 +217,7 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd +License: LGPL-2.1-or-later Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -227,6 +229,7 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -238,6 +241,7 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd +License: LGPL-2.1-or-later %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -266,6 +270,7 @@ 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 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires: group(kvm) @@ -297,6 +302,7 @@ 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 %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -310,6 +316,7 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev +License: LGPL-2.1-or-later Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -324,6 +331,7 @@ 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 Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -336,6 +344,7 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -352,6 +361,7 @@ and systemd-importd. %if %{with networkd} || %{with resolved} %package network Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) @@ -369,6 +379,7 @@ resolver tools for resolved %if %{with portabled} %package portable Summary: Systemd tools for portable services +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires @@ -387,6 +398,7 @@ https://systemd.io/PORTABLE_SERVICES %if ! 0%{?bootstrap} %package logger Summary: Journal only logging +License: LGPL-2.1-or-later Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -397,6 +409,7 @@ 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 %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -408,6 +421,7 @@ 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 %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -423,6 +437,7 @@ 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 Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -438,6 +453,7 @@ 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 %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -453,6 +469,7 @@ 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 Requires: %{name} = %{version}-%{release} %systemd_requires @@ -469,6 +486,7 @@ systemd-journal-remote, and systemd-journal-upload. %if %{with tests} %package tests Summary: Unit tests for systemd +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama @@ -486,6 +504,7 @@ to run all unit tests at once. %if %{with experimental} %package experimental Summary: Experimental systemd features +License: LGPL-2.1-or-later 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 b0462bb8..bb539039 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu May 20 18:52:53 UTC 2021 - Franck Bui + +- Restore all "License:" tags + + udev uses a different license (GPL-2.0-only) than the main package + and "osc service localrun format_spec_file" has the good taste to + restore the license tags for all other subpackages if one of the + subpackage tag differs. + ------------------------------------------------------------------- Thu May 20 15:47:38 UTC 2021 - Franck Bui @@ -10,8 +20,8 @@ Wed May 19 06:54:57 UTC 2021 - Franck Bui - Drop all "Group:" tags as they are deprecated. - - Drop "License:" tags from all all subpackages and make it - inherited from the main package. + - Drop "License:" tags from all subpackages and make it inherited + from the main package. - Drop "%bcond_with parentpathid" as it's not used. diff --git a/systemd.spec b/systemd.spec index 59e9c3ff..b41a2643 100644 --- a/systemd.spec +++ b/systemd.spec @@ -204,6 +204,7 @@ drop-in replacement for sysvinit. %if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd +License: LGPL-2.1-or-later Supplements: (systemd and patterns-base-documentation) %description doc @@ -214,6 +215,7 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd +License: LGPL-2.1-or-later Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -225,6 +227,7 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -236,6 +239,7 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd +License: LGPL-2.1-or-later %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -264,6 +268,7 @@ 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 URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires: group(kvm) @@ -295,6 +300,7 @@ 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 %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -308,6 +314,7 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev +License: LGPL-2.1-or-later Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -322,6 +329,7 @@ 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 Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -334,6 +342,7 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -350,6 +359,7 @@ and systemd-importd. %if %{with networkd} || %{with resolved} %package network Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) @@ -367,6 +377,7 @@ resolver tools for resolved %if %{with portabled} %package portable Summary: Systemd tools for portable services +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires @@ -385,6 +396,7 @@ https://systemd.io/PORTABLE_SERVICES %if ! 0%{?bootstrap} %package logger Summary: Journal only logging +License: LGPL-2.1-or-later Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -395,6 +407,7 @@ 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 %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -406,6 +419,7 @@ 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 %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -421,6 +435,7 @@ 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 Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -436,6 +451,7 @@ 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 %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -451,6 +467,7 @@ 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 Requires: %{name} = %{version}-%{release} %systemd_requires @@ -467,6 +484,7 @@ systemd-journal-remote, and systemd-journal-upload. %if %{with tests} %package tests Summary: Unit tests for systemd +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama @@ -484,6 +502,7 @@ to run all unit tests at once. %if %{with experimental} %package experimental Summary: Experimental systemd features +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2