From 985450a668e4a4128762d9b4c36d0267fb8aa07d62d9dcb0396b56d918ffb679 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 19 May 2008 21:55:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=89 --- aaa_base-rpmlintrc | 4 ++-- aaa_base.changes | 8 ++++++++ aaa_base.post | 4 ++-- aaa_base.spec | 11 ++++++++--- aaa_base.tar.bz2 | 4 ++-- sysconfig_parts.tar.bz2 | 4 ++-- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/aaa_base-rpmlintrc b/aaa_base-rpmlintrc index 6f62e03..277bef5 100644 --- a/aaa_base-rpmlintrc +++ b/aaa_base-rpmlintrc @@ -43,7 +43,7 @@ addFilter("no-reload-entry.*/etc/init.d/boot") addFilter("no-reload-entry.*/etc/init.d/boot.sched") addFilter("no-reload-entry.*/etc/init.d/boot.klog") addFilter("no-reload-entry.*/etc/init.d/rc") -addFilter("no-reload-entry.*/etc/init.d/boot.setclock") +addFilter("no-reload-entry.*/etc/init.d/boot.clock") addFilter("no-reload-entry.*/etc/init.d/boot.localnet") addFilter("no-reload-entry.*/etc/init.d/boot.localfs") # the following init scripts don't need to be stopped - @@ -67,7 +67,7 @@ addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.sched") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.klog") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/rc") -addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.setclock") +addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.clock") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localnet") addFilter("init-script-without-%stop_on_removal-preun.*/etc/init.d/boot.localfs") diff --git a/aaa_base.changes b/aaa_base.changes index 2fb9e88..540c9d6 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon May 19 17:52:34 CEST 2008 - werner@suse.de + +- Move udev from the Required to the PreRequired list (bnc#384254) +- Rename boot.setclock to boot.clock but preserve boot.getclock + this avoid to get temporary boot.clock provided twice during + update (bnc#384254) + ------------------------------------------------------------------- Fri May 9 14:16:59 CEST 2008 - olh@suse.de diff --git a/aaa_base.post b/aaa_base.post index d0bb3e8..8047aa3 100644 --- a/aaa_base.post +++ b/aaa_base.post @@ -89,12 +89,12 @@ fi # # Initialize runlevel links # -%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.setclock boot.getclock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single} +%{fillup_and_insserv -py boot.proc boot.localfs boot.swap boot.clock boot.getclock boot.ldconfig boot.ipconfig boot.klog boot.localnet halt random reboot single} %{insserv_force_if_yast etc/init.d/boot.loadmodules etc/init.d/boot.cleanup etc/init.d/boot.rootfsck} ## powerfail probably needs empty header ... # add Kill-links in boot.d if needed: -for i in proc localfs swap setclock getclock ldconfig ipconfig klog localnet loadmodules sched ; do +for i in proc localfs swap clock getclock ldconfig ipconfig klog localnet loadmodules sched ; do if [ -f /etc/init.d/boot.d/S??boot.$i -a ! -f /etc/init.d/boot.d/K??boot.$i ] ; then %{insserv_force_if_yast boot.$i} fi diff --git a/aaa_base.spec b/aaa_base.spec index 55e66bb..a854daa 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -16,12 +16,12 @@ License: GPL v2 or later Group: System/Fhs Provides: bin bootutls etc skeleng skelger aaa_skel Obsoletes: aaa_skel -Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio udev psmisc +Requires: filesystem distribution-release /bin/mktemp /usr/bin/find /usr/bin/tput /usr/bin/xargs mingetty /bin/login cpio psmisc Recommends: cron logrotate -PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools +PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.0 -Release: 66 +Release: 69 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +143,11 @@ rm -f /root/.gnupg/secring.gpg.aaa_save %defattr(-,root,root) %changelog +* Mon May 19 2008 werner@suse.de +- Move udev from the Required to the PreRequired list (bnc#384254) +- Rename boot.setclock to boot.clock but preserve boot.getclock + this avoid to get temporary boot.clock provided twice during + update (bnc#384254) * Fri May 09 2008 olh@suse.de - enable swap to ps3vram in boot.swap * Fri May 09 2008 werner@suse.de diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2 index e56686c..99a7836 100644 --- a/aaa_base.tar.bz2 +++ b/aaa_base.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24b2f92222cdafa9b15b23e0d9c699e3aff17846a4a4ba97fde3f3b2773faeac -size 78558 +oid sha256:ee9e13cbf457d98b1c06a1eeea70a204f263d338331d5414e593063411dbfc87 +size 78519 diff --git a/sysconfig_parts.tar.bz2 b/sysconfig_parts.tar.bz2 index 388b3b0..1254f0e 100644 --- a/sysconfig_parts.tar.bz2 +++ b/sysconfig_parts.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bf18e2a89a26162dbc28f3cb1133ad4c661d9d855b67a37e39ad6a8c889c236 -size 8397 +oid sha256:c2911bc557abf783b9b7f94718e614d40d5772aa76b32eefb539163133f72e82 +size 8420