From 52b288bd3ac7d71b6499447aba03c2a0796245f18d0d5c08f0531ed9ad630131 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 13 Feb 2015 10:05:19 +0000 Subject: [PATCH] G 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch G 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=845 --- systemd-mini-rpmlintrc | 1 - systemd-mini.changes | 2 ++ systemd-mini.spec | 8 ++++++-- systemd-rpmlintrc | 1 - systemd.changes | 2 ++ systemd.spec | 3 ++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index db493f62..a9e12af8 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -1,4 +1,3 @@ -setBadness("suse-dbus-unauthorized-service", 0) addFilter("invalid-pkgconfig-file") addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") addFilter(".*dangling-symlink .* /dev/null.*") diff --git a/systemd-mini.changes b/systemd-mini.changes index 79bcf372..20d2f8ae 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -21,6 +21,8 @@ Fri Jan 9 18:48:28 UTC 2015 - jengelh@inai.de N=no longer applies to source nor is it deemed needed; K=killed: no longer applicable and too complex to resolve: ---- + G 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch + G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch K service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch K remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch K handle-SYSTEMCTL_OPTIONS-environment-variable.patch diff --git a/systemd-mini.spec b/systemd-mini.spec index ce3049ff..867ef076 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ %define udevpkgname udev-mini %define udev_major 1 %bcond_without bash_completion -%bcond_with networkd +%bcond_without networkd %bcond_with python %bcond_with parentpathid %ifarch %{ix86} x86_64 aarch64 @@ -121,6 +121,7 @@ Requires: kbd Requires: kmod >= 15 Requires: netcfg Requires: pam-config >= 0.79-5 +BuildRequires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools @@ -1275,6 +1276,9 @@ exit 0 /bin/systemd /bin/systemd-ask-password /bin/systemctl +%if %{with networkd} +%{_bindir}/networkctl +%endif %{_bindir}/systemd-sleep-grub %{_bindir}/busctl %{_bindir}/kernel-install diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index db493f62..a9e12af8 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -1,4 +1,3 @@ -setBadness("suse-dbus-unauthorized-service", 0) addFilter("invalid-pkgconfig-file") addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") addFilter(".*dangling-symlink .* /dev/null.*") diff --git a/systemd.changes b/systemd.changes index 79bcf372..20d2f8ae 100644 --- a/systemd.changes +++ b/systemd.changes @@ -21,6 +21,8 @@ Fri Jan 9 18:48:28 UTC 2015 - jengelh@inai.de N=no longer applies to source nor is it deemed needed; K=killed: no longer applicable and too complex to resolve: ---- + G 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch + G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch K service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch K remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch K handle-SYSTEMCTL_OPTIONS-environment-variable.patch diff --git a/systemd.spec b/systemd.spec index 25bbe396..53048540 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -116,6 +116,7 @@ Requires: kbd Requires: kmod >= 15 Requires: netcfg Requires: pam-config >= 0.79-5 +BuildRequires: pam-config >= 0.79-5 Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools