Accepting request 844519 from Base:System
- rpm file lists are now generated from the spec file. - Make sure the release number between the main and the branding packages match - 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) - Import 0.2 OBS-URL: https://build.opensuse.org/request/show/844519 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd-default-settings?expand=0&rev=2
This commit is contained in:
commit
7c60718b7e
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a9de0fae3a29dd26c8c8c603e3efd2271f431bb2198e1688e4dc00b4c7156db5
|
||||
size 1224
|
3
systemd-default-settings-0.4.tar.gz
Normal file
3
systemd-default-settings-0.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:eb828b0d75db9244e0c46d39a50a1c49e7f732b717d8ad025c4135b3683c78a2
|
||||
size 1411
|
@ -1,7 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 27 15:00:12 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- rpm file lists are now generated from the spec file.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 26 14:40:56 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Make sure the release number between the main and the branding
|
||||
packages match
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 23 08:09:00 UTC 2020 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- 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 <fbui@suse.com>
|
||||
|
||||
- Import v0.2
|
||||
- Import 0.2
|
||||
|
||||
cc4e951 timesyncd: add default ntp servers for SUSE and openSUSE distros
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
Name: systemd-default-settings
|
||||
URL: https://github.com/openSUSE/systemd-default-settings
|
||||
Version: 0.2
|
||||
Version: 0.4
|
||||
Release: 0
|
||||
Summary: Customization of systemd default settings for SUSE distributions
|
||||
License: GPL-2.0-or-later
|
||||
@ -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)
|
||||
|
||||
@ -75,11 +75,15 @@ package.
|
||||
%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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user