From d083b08ff13d5cabc4386c6b79c5fb8b868d79999cae114afa1a3426ae65896e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 23 Jan 2014 13:37:13 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=496 --- systemd-mini.changes | 30 ++++++++++++++++++++++++++++++ systemd-mini.spec | 13 ++++++++++++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index b1df88a4..60444215 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Jan 23 13:24:53 UTC 2014 - werner@suse.de + +- Make systemd-mini build + +------------------------------------------------------------------- +Thu Jan 23 13:18:39 UTC 2014 - werner@suse.de + +- Make requires bash-completion a recommends + +------------------------------------------------------------------- +Tue Jan 21 13:05:59 UTC 2014 - werner@suse.de + +- Add patch 1017-skip-native-unit-handling-if-sysv-already-handled.patch + to avoid that enabled boot scripts will be handled as unit files + by systemctl status command (bnc#818044) + ------------------------------------------------------------------- Tue Jan 21 12:51:20 UTC 2014 - werner@suse.de @@ -107,6 +124,19 @@ Fri Dec 6 13:30:19 UTC 2013 - werner@suse.de the systemd-journald (bnc#838475) - Let us build require the package config for libpcre (bnc#853293) +------------------------------------------------------------------- +Sat Nov 30 08:16:02 UTC 2013 - arvidjaar@gmail.com + +- Add patch + 0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch + Make sure emergency shell is not killed by attempt to start another unit + (bnc#852021). Backported from d420282b28f50720e233ccb1c02547c562195653. +- Add patch + make-emergency.service-conflict-with-syslog.socket.patch + Previous patch did not fix problem if syslog connection request came + after emergency shell was already started. So forcibly stop syslog.socket + when starting emergency.service. (bnc#852232) + ------------------------------------------------------------------- Thu Nov 28 10:25:58 UTC 2013 - lbsousajr@gmail.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 95113a41..eb3c19c3 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -95,7 +95,7 @@ Conflicts: kiwi #!BuildIgnore: udev Requires: %{udevpkgname} >= 172 %if %{with bash_completion} -Requires: bash-completion +Recommends: bash-completion %endif Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -257,6 +257,10 @@ Patch80: 0001-analyze-set-text-on-side-with-most-space.patch Patch81: 0001-logind-garbage-collect-stale-users.patch # PATCH-FIX-UPSTREAM analyze-fix-crash-in-command-line-parsing.patch fcrozat@suse.com bnc#859365 -- Fix crash in systemd-analyze Patch82: analyze-fix-crash-in-command-line-parsing.patch +# PATCH-FIX-UPSTREAM 0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch -- Prevent accidental kill of emergency shell (bnc#852021) +Patch83: 0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch +# PATCH-FIX-OPENSUSE make-emergency.service-conflict-with-syslog.socket.patch (bnc#852232) +Patch84: make-emergency.service-conflict-with-syslog.socket.patch # udev patches # PATCH-FIX-OPENSUSE 1001-re-enable-by_path-links-for-ata-devices.patch @@ -289,6 +293,8 @@ Patch1014: 1014-journald-with-journaling-FS.patch Patch1015: build-sys-make-multi-seat-x-optional.patch # PATCH-FIX-SUSE 1016-support-powerfail-with-powerstatus.patch Patch1016: 1016-support-powerfail-with-powerstatus.patch +# PATCH-FIX-UPSTREAM 1017-skip-native-unit-handling-if-sysv-already-handled.patch +Patch1017: 1017-skip-native-unit-handling-if-sysv-already-handled.patch # PATCH-FIX-SUSE 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch Patch1018: 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch # PATCH-FIX-SUSE 1019-make-completion-smart-to-be-able-to-redirect.patch @@ -557,6 +563,8 @@ cp %{SOURCE7} m4/ %patch80 -p1 %patch81 -p1 %patch82 -p1 +%patch83 -p1 +%patch84 -p1 # udev patches %patch1001 -p1 @@ -577,6 +585,7 @@ cp %{SOURCE7} m4/ %patch1014 -p1 %patch1015 -p1 %patch1016 -p1 +%patch1017 -p1 %patch1018 -p1 %patch1019 -p1 @@ -759,7 +768,9 @@ ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-us # support for SIGPWR handling with /var/run/powerstatus of e.g. powerd install -m 755 %{S:12} %{buildroot}/%{_prefix}/lib/systemd/ install -m 644 units/powerfail.service %{buildroot}/%{_prefix}/lib/systemd/system/ +%if ! 0%{?bootstrap} install -m 644 man/systemd-powerfail.service.8 %{buildroot}/%{_mandir}/man8/ +%endif # clean out some completions which requires bash-completion package %if %{without bash_completion}