From 910f0f8f033c66fc779e92baa367ba74ed1ba5841b1f65d8b646c35ea10580af Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 26 Sep 2010 22:49:25 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/systemd revision 6 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696 --- systemd-10.tar.bz2 | 3 +++ systemd-9.tar.bz2 | 3 --- systemd.changes | 39 +++++++++++++++++++++++++++++++++++ systemd.spec | 51 +++++++++++++++++++++------------------------- 4 files changed, 65 insertions(+), 31 deletions(-) create mode 100644 systemd-10.tar.bz2 delete mode 100644 systemd-9.tar.bz2 diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 new file mode 100644 index 00000000..7b9bf091 --- /dev/null +++ b/systemd-10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde1144e7ac56da7c022dd1aefe3587c70e92fe8c393039cbf1f02269f8f2265 +size 680700 diff --git a/systemd-9.tar.bz2 b/systemd-9.tar.bz2 deleted file mode 100644 index dc66f76c..00000000 --- a/systemd-9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31323d052daff12e86b9971b2ecd20c12f4ac41ed04ee11a1eb2686a2c9bb313 -size 666685 diff --git a/systemd.changes b/systemd.changes index 8af63d2d..c5ba6a82 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Sun Sep 26 20:39:53 UTC 2010 - aj@suse.de + +- Do not package man pages twice. + +------------------------------------------------------------------- +Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - basic services are enabled by default now + +------------------------------------------------------------------- +Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - vconsole and locale setup + - hook up tmpwatch + +------------------------------------------------------------------- +Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - add new utility to initialize the virtual console + - initialize locale from /etc/locale by default + - ask-password: allow services query SSL/harddisk passphrases + +------------------------------------------------------------------- +Fri Sep 17 10:54:24 CEST 2010 - kay.sievers@novell.com + +- version 10 + - logger: support SOCK_STREAM /dev/log sockets + - make sure the file system is writable before we write utmp data + - systemctl: use isolate when called as telinit for a runlevel + - initctl: properly use isolate when activating runlevels + - set HOME=/root when running shells + - make sure we don't crash if there's an automount unit without + mount unit + - start logger only after syslog is up + ------------------------------------------------------------------- Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 6da472fa..17c2231c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file for package systemd (Version 9) +# spec file for package systemd (Version 10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 9 +Version: 10 Release: 1 License: GPLv2+ Group: System/Base @@ -32,10 +32,13 @@ BuildRequires: libcap-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: dbus-1-glib-devel gtk2-devel +BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 162 Requires: dbus-1 >= 1.4.0 +Requires: kbd +Requires: util-linux +Requires: tmpwatch Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc @@ -112,39 +115,20 @@ ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random if [ "$1" -eq 1 ]; then # Try to read default runlevel from the old inittab if it exists runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) - if [ -z "$runlevel" ] ; then - target="/lib/systemd/system/graphical.target" - else - target="/lib/systemd/system/runlevel$runlevel.target" + if [ -n "$runlevel" ] ; then + /bin/ln -sf /lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || : fi - /bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || : # Enable these services by default. /bin/systemctl enable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi @@ -156,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT /bin/systemd /bin/systemctl /bin/systemd-notify +/bin/systemd-ask-password %{_bindir}/systemd-cgls /lib/systemd/systemd-* /%{_lib}/security/pam_systemd.so @@ -164,14 +149,23 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/xdg/systemd/session %dir %{_sysconfdir}/modules.d %config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target -%config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc +# Packaged in gtk subpackage +%exclude %{_mandir}/man1/systemadm.1* +# Packaged in sysvinit subpackage +%exclude %{_mandir}/man1/init.1* +%exclude %{_mandir}/man8/halt.8* +%exclude %{_mandir}/man8/reboot.8* +%exclude %{_mandir}/man8/shutdown.8* +%exclude %{_mandir}/man8/poweroff.8* +%exclude %{_mandir}/man8/telinit.8* +%exclude %{_mandir}/man8/runlevel.8* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -186,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm +%{_bindir}/systemd-ask-password-agent %{_mandir}/man1/systemadm.1* %files sysvinit