From fe524b82277b204d1b1f79116340c411260d14c2652b60cf9a7bcf570d8c3382 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 23 Oct 2020 08:17:46 +0000 Subject: [PATCH 1/4] - Import 0.3 d299248 List drop-in directories in SUSE.list exclusively e4651a7 Disable memory accounting by default for all distros (jsc#PM-2229 jsc#PM-2230) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=6 --- systemd-default-settings-0.2.tar.gz | 3 --- systemd-default-settings-0.3.tar.gz | 3 +++ systemd-default-settings.changes | 10 +++++++++- systemd-default-settings.spec | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-default-settings-0.2.tar.gz create mode 100644 systemd-default-settings-0.3.tar.gz diff --git a/systemd-default-settings-0.2.tar.gz b/systemd-default-settings-0.2.tar.gz deleted file mode 100644 index bd5513b..0000000 --- a/systemd-default-settings-0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9de0fae3a29dd26c8c8c603e3efd2271f431bb2198e1688e4dc00b4c7156db5 -size 1224 diff --git a/systemd-default-settings-0.3.tar.gz b/systemd-default-settings-0.3.tar.gz new file mode 100644 index 0000000..27b19e8 --- /dev/null +++ b/systemd-default-settings-0.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:402b05d82814ece139fdf5cb0f405b2fd7f756686343dc5435271db0516b6ca5 +size 1419 diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes index a238530..6dd023e 100644 --- a/systemd-default-settings.changes +++ b/systemd-default-settings.changes @@ -1,7 +1,15 @@ +------------------------------------------------------------------- +Fri Oct 23 08:09:00 UTC 2020 - Franck Bui + +- Import 0.3 + + d299248 List drop-in directories in SUSE.list exclusively + e4651a7 Disable memory accounting by default for all distros (jsc#PM-2229 jsc#PM-2230) + ------------------------------------------------------------------- Tue Oct 13 08:43:43 UTC 2020 - Franck Bui -- Import v0.2 +- Import 0.2 cc4e951 timesyncd: add default ntp servers for SUSE and openSUSE distros diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index 09ea39a..b3992fa 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -18,7 +18,7 @@ Name: systemd-default-settings URL: https://github.com/openSUSE/systemd-default-settings -Version: 0.2 +Version: 0.3 Release: 0 Summary: Customization of systemd default settings for SUSE distributions License: GPL-2.0-or-later From 3cb8fd23163e3e82b03ad3214a4b623467651751ae5446a7ab73d1e8f0de55a7 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 26 Oct 2020 14:42:10 +0000 Subject: [PATCH 2/4] - Make sure the release number between the main and the branding packages match OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=7 --- systemd-default-settings.changes | 6 ++++++ systemd-default-settings.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes index 6dd023e..3914bdc 100644 --- a/systemd-default-settings.changes +++ b/systemd-default-settings.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 26 14:40:56 UTC 2020 - Franck Bui + +- Make sure the release number between the main and the branding + packages match + ------------------------------------------------------------------- Fri Oct 23 08:09:00 UTC 2020 - Franck Bui diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index b3992fa..04a8159 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -26,7 +26,7 @@ Group: System/Base Source0: %{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: systemd-rpm-macros -Requires: %{name}-branding = %{version} +Requires: %{name}-branding = %{version}-%{release} %description This package overrides some of the upstream default settings which are @@ -38,9 +38,9 @@ pulled in by the branding package instead. %package branding-SLE Summary: Specific customization of systemd defaults settings for SLE Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-SLE) -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: otherproviders(%{name}-branding) %description branding-SLE @@ -50,9 +50,9 @@ them better suited for SLE distributions. %package branding-openSUSE Summary: Specific customization of systemd defaults settings for openSUSE Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Supplements: packageand(%{name}:branding-openSUSE) -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: otherproviders(%{name}-branding) %description branding-openSUSE @@ -62,7 +62,7 @@ them better suited for openSUSE distributions. %package branding-upstream Summary: Restore upstream systemd defaults settings Group: System/Base -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{version}-%{release} Conflicts: %{name} Conflicts: otherproviders(%{name}-branding) From 61f9f657c66b5b9e69095cec8c7245c16fb3df6868fb52ada384c39aeb616472 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 27 Oct 2020 15:00:52 +0000 Subject: [PATCH 3/4] - rpm file lists are now generated from the spec file. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=8 --- systemd-default-settings-0.3.tar.gz | 3 --- systemd-default-settings-0.4.tar.gz | 3 +++ systemd-default-settings.changes | 5 +++++ systemd-default-settings.spec | 10 ++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 systemd-default-settings-0.3.tar.gz create mode 100644 systemd-default-settings-0.4.tar.gz diff --git a/systemd-default-settings-0.3.tar.gz b/systemd-default-settings-0.3.tar.gz deleted file mode 100644 index 27b19e8..0000000 --- a/systemd-default-settings-0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:402b05d82814ece139fdf5cb0f405b2fd7f756686343dc5435271db0516b6ca5 -size 1419 diff --git a/systemd-default-settings-0.4.tar.gz b/systemd-default-settings-0.4.tar.gz new file mode 100644 index 0000000..518ef11 --- /dev/null +++ b/systemd-default-settings-0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb828b0d75db9244e0c46d39a50a1c49e7f732b717d8ad025c4135b3683c78a2 +size 1411 diff --git a/systemd-default-settings.changes b/systemd-default-settings.changes index 3914bdc..7c1707c 100644 --- a/systemd-default-settings.changes +++ b/systemd-default-settings.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 27 15:00:12 UTC 2020 - Franck Bui + +- rpm file lists are now generated from the spec file. + ------------------------------------------------------------------- Mon Oct 26 14:40:56 UTC 2020 - Franck Bui diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index 04a8159..9224052 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -18,7 +18,7 @@ Name: systemd-default-settings URL: https://github.com/openSUSE/systemd-default-settings -Version: 0.3 +Version: 0.4 Release: 0 Summary: Customization of systemd default settings for SUSE distributions License: GPL-2.0-or-later @@ -74,12 +74,14 @@ package. %prep %setup -q -%build -%make_build - %install %make_install +find %{buildroot} -name \*.d -type d -printf "%%%%dir /%%P\n" >SUSE.list +find %{buildroot} -name 20-defaults-SUSE.conf -printf "/%%P\n" >>SUSE.list +find %{buildroot} -name 25-defaults-SLE.conf -printf "/%%P\n" >SLE.list +find %{buildroot} -name 25-defaults-openSUSE.conf -printf "/%%P\n" >openSUSE.list + %files -f SUSE.list %defattr(-,root,root) From 3d7d3a222a51067e1679d2b8f6ea73994877c5566bad182db23454e92f9cc167 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 28 Oct 2020 09:44:16 +0000 Subject: [PATCH 4/4] add an empty %build section to fix a build failure OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-default-settings?expand=0&rev=9 --- systemd-default-settings.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemd-default-settings.spec b/systemd-default-settings.spec index 9224052..5ae1f4d 100644 --- a/systemd-default-settings.spec +++ b/systemd-default-settings.spec @@ -74,6 +74,8 @@ package. %prep %setup -q +%build + %install %make_install