Accepting request 592079 from home:fbui:systemd:Factory
- Drop systemd-bash-completion sub-package Now we directly ship the completion scripts from the main package as we already do for zsh. I couldn't see any advantages in this split. - Be more accurate when specifiying the tools version we provide - Make sure rpm won't expand %autopatch even if it's commented - stat(1) as well as systemctl are not use in %post section of udev So remove stat(1) from the list of dep and move systemctl to the requirements of %postun since it's called from there. - Be more accurate when specifiying the tools version we provide - Make sure rpm won't expand %autopatch even if it's commented - stat(1) as well as systemctl are not use in %post section of udev So remove stat(1) from the list of dep and move systemctl to the requirements of %postun since it's called from there. OBS-URL: https://build.opensuse.org/request/show/592079 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1024
This commit is contained in:
Franck Bui
Git OBS Bridge
parent
f021228999
commit
23808f6167
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Drop systemd-bash-completion sub-package
|
||||
|
||||
Now we directly ship the completion scripts from the main package as
|
||||
we already do for zsh. I couldn't see any advantages in this split.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:12:26 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Be more accurate when specifiying the tools version we provide
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:00:24 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Make sure rpm won't expand %autopatch even if it's commented
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 14:55:36 UTC 2018 - fbui@suse.com
|
||||
|
||||
- stat(1) as well as systemctl are not use in %post section of udev
|
||||
|
||||
So remove stat(1) from the list of dep and move systemctl to the
|
||||
requirements of %postun since it's called from there.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com
|
||||
|
||||
|
||||
@ -121,7 +121,6 @@ Requires: sysvinit-tools
|
||||
Requires: udev = %{version}-%{release}
|
||||
Requires: util-linux >= 2.27.1
|
||||
Requires: group(lock)
|
||||
Recommends: %{name}-bash-completion
|
||||
Requires(post): coreutils
|
||||
Requires(post): findutils
|
||||
Requires(post): systemd-presets-branding
|
||||
@ -136,7 +135,7 @@ Conflicts: sysvinit
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
Provides: systemd-analyze = %{version}
|
||||
Provides: systemd-analyze = %{version}-%{release}
|
||||
Obsoletes: pm-utils <= 1.4.1
|
||||
Obsoletes: suspend <= 1.0
|
||||
Source0: systemd-v%{version}%{suse_version}.tar.xz
|
||||
@ -235,12 +234,10 @@ 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(pre): /usr/bin/stat
|
||||
Requires(post): sed
|
||||
Requires(post): /usr/bin/systemctl
|
||||
|
||||
Requires(post): coreutils
|
||||
Requires(postun): coreutils
|
||||
Requires(postun): /usr/bin/systemctl
|
||||
Requires(posttrans): suse-module-tools >= 12.4
|
||||
|
||||
Conflicts: systemd < 39
|
||||
@ -252,7 +249,7 @@ Conflicts: util-linux < 2.16
|
||||
Conflicts: ConsoleKit < 0.4.1
|
||||
Requires: filesystem
|
||||
%if 0%{?bootstrap}
|
||||
Provides: udev = %{version}
|
||||
Provides: udev = %{version}-%{release}
|
||||
Conflicts: libudev1
|
||||
Conflicts: udev
|
||||
# avoid kiwi picking it for bootstrap
|
||||
@ -287,8 +284,8 @@ License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Other
|
||||
Requires: libudev%{?mini}1 = %{version}-%{release}
|
||||
%if 0%{?bootstrap}
|
||||
Provides: libudev-devel = %{version}
|
||||
Conflicts: libudev1 = %{version}
|
||||
Provides: libudev-devel = %{version}-%{release}
|
||||
Conflicts: libudev1 = %{version}-%{release}
|
||||
Conflicts: libudev-devel
|
||||
%endif
|
||||
|
||||
@ -425,22 +422,9 @@ This package contains systemd-journal-gatewayd,
|
||||
systemd-journal-remote, and systemd-journal-upload.
|
||||
%endif
|
||||
|
||||
%package bash-completion
|
||||
Summary: Bash completion support for systemd
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: bash-completion
|
||||
BuildArch: noarch
|
||||
%if 0%{?bootstrap}
|
||||
Conflicts: systemd-bash-completion
|
||||
%endif
|
||||
|
||||
%description bash-completion
|
||||
Some systemd commands offer bash completion, but it is an optional dependency.
|
||||
|
||||
%prep
|
||||
%setup -q -n systemd-v%{version}%{suse_version}
|
||||
# %autopatch -p1
|
||||
# %%autopatch -p1
|
||||
|
||||
%build
|
||||
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
@ -1151,6 +1135,11 @@ fi
|
||||
%ghost %{_localstatedir}/lib/systemd/catalog/database
|
||||
%ghost %{_localstatedir}/lib/systemd/backlight
|
||||
%ghost %{_localstatedir}/lib/systemd/random-seed
|
||||
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
|
||||
%dir %{_datadir}/zsh
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/*
|
||||
@ -1363,10 +1352,4 @@ fi
|
||||
%{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%files bash-completion
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Drop systemd-bash-completion sub-package
|
||||
|
||||
Now we directly ship the completion scripts from the main package as
|
||||
we already do for zsh. I couldn't see any advantages in this split.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:12:26 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Be more accurate when specifiying the tools version we provide
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 15:00:24 UTC 2018 - fbui@suse.com
|
||||
|
||||
- Make sure rpm won't expand %autopatch even if it's commented
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 14:55:36 UTC 2018 - fbui@suse.com
|
||||
|
||||
- stat(1) as well as systemctl are not use in %post section of udev
|
||||
|
||||
So remove stat(1) from the list of dep and move systemctl to the
|
||||
requirements of %postun since it's called from there.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com
|
||||
|
||||
|
||||
39
systemd.spec
39
systemd.spec
@ -119,7 +119,6 @@ Requires: sysvinit-tools
|
||||
Requires: udev = %{version}-%{release}
|
||||
Requires: util-linux >= 2.27.1
|
||||
Requires: group(lock)
|
||||
Recommends: %{name}-bash-completion
|
||||
Requires(post): coreutils
|
||||
Requires(post): findutils
|
||||
Requires(post): systemd-presets-branding
|
||||
@ -134,7 +133,7 @@ Conflicts: sysvinit
|
||||
Conflicts: filesystem < 11.5
|
||||
Conflicts: mkinitrd < 2.7.0
|
||||
Obsoletes: systemd-analyze < 201
|
||||
Provides: systemd-analyze = %{version}
|
||||
Provides: systemd-analyze = %{version}-%{release}
|
||||
Obsoletes: pm-utils <= 1.4.1
|
||||
Obsoletes: suspend <= 1.0
|
||||
Source0: systemd-v%{version}%{suse_version}.tar.xz
|
||||
@ -233,12 +232,10 @@ 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(pre): /usr/bin/stat
|
||||
Requires(post): sed
|
||||
Requires(post): /usr/bin/systemctl
|
||||
|
||||
Requires(post): coreutils
|
||||
Requires(postun): coreutils
|
||||
Requires(postun): /usr/bin/systemctl
|
||||
Requires(posttrans): suse-module-tools >= 12.4
|
||||
|
||||
Conflicts: systemd < 39
|
||||
@ -250,7 +247,7 @@ Conflicts: util-linux < 2.16
|
||||
Conflicts: ConsoleKit < 0.4.1
|
||||
Requires: filesystem
|
||||
%if 0%{?bootstrap}
|
||||
Provides: udev = %{version}
|
||||
Provides: udev = %{version}-%{release}
|
||||
Conflicts: libudev1
|
||||
Conflicts: udev
|
||||
# avoid kiwi picking it for bootstrap
|
||||
@ -285,8 +282,8 @@ License: LGPL-2.1-or-later
|
||||
Group: Development/Libraries/Other
|
||||
Requires: libudev%{?mini}1 = %{version}-%{release}
|
||||
%if 0%{?bootstrap}
|
||||
Provides: libudev-devel = %{version}
|
||||
Conflicts: libudev1 = %{version}
|
||||
Provides: libudev-devel = %{version}-%{release}
|
||||
Conflicts: libudev1 = %{version}-%{release}
|
||||
Conflicts: libudev-devel
|
||||
%endif
|
||||
|
||||
@ -423,22 +420,9 @@ This package contains systemd-journal-gatewayd,
|
||||
systemd-journal-remote, and systemd-journal-upload.
|
||||
%endif
|
||||
|
||||
%package bash-completion
|
||||
Summary: Bash completion support for systemd
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Base
|
||||
Requires: bash-completion
|
||||
BuildArch: noarch
|
||||
%if 0%{?bootstrap}
|
||||
Conflicts: systemd-bash-completion
|
||||
%endif
|
||||
|
||||
%description bash-completion
|
||||
Some systemd commands offer bash completion, but it is an optional dependency.
|
||||
|
||||
%prep
|
||||
%setup -q -n systemd-v%{version}%{suse_version}
|
||||
# %autopatch -p1
|
||||
# %%autopatch -p1
|
||||
|
||||
%build
|
||||
opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org)
|
||||
@ -1149,6 +1133,11 @@ fi
|
||||
%ghost %{_localstatedir}/lib/systemd/catalog/database
|
||||
%ghost %{_localstatedir}/lib/systemd/backlight
|
||||
%ghost %{_localstatedir}/lib/systemd/random-seed
|
||||
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
|
||||
%dir %{_datadir}/zsh
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/*
|
||||
@ -1361,10 +1350,4 @@ fi
|
||||
%{_datadir}/systemd/gatewayd
|
||||
%endif
|
||||
|
||||
%files bash-completion
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/bash-completion
|
||||
%dir %{_datadir}/bash-completion/completions
|
||||
%{_datadir}/bash-completion/completions/*
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user