diff --git a/systemd-28.tar.bz2 b/systemd-28.tar.bz2 deleted file mode 100644 index 4c2dabb2..00000000 --- a/systemd-28.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92e98fe32c7cff50933a3b865e28efba870fbacfa51cd58f2d13f117eb31a2c6 -size 816790 diff --git a/systemd-29.tar.bz2 b/systemd-29.tar.bz2 new file mode 100644 index 00000000..b9e21e45 --- /dev/null +++ b/systemd-29.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c41153c3ebab9e25b16fa1670946ce6dfdd1515608a37eedd80d2bbe46629971 +size 810407 diff --git a/systemd.changes b/systemd.changes index c89d0919..00d55141 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Jun 17 09:34:24 UTC 2011 - fcrozat@novell.com + +- version 29: + + enable chkconfig support in systemctl for openSUSE. + + systemctl: plug a leak upon create_symlink mismatch + + mount /run without MS_NOEXEC + + dbus: fix name of capability property + + systemctl: fix double unref of a dbus message + + cryptsetup-generator: fix /etc/cryptsetup options + + selinux: selinuxfs can be mounted on /sys/fs/selinux + + readahead-common: fix total memory size detection + + systemctl: fix 'is-enabled' for native units under /lib + + systemctl: fix a FILE* leak + + pam-module: add debug= parameter + + remote-fs.target: do not order after network.target +- update tarball url. + +------------------------------------------------------------------- +Wed Jun 15 10:00:29 UTC 2011 - saschpe@suse.de + +- Use RPM macros instead of $RPM_FOO variables +- Don't require %{version}-%{release} of the base package, + %{version} is sufficient + ------------------------------------------------------------------- Tue Jun 14 15:10:41 CEST 2011 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 8805480b..c8c2e175 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,8 +21,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 28 -Release: 2 +Version: 29 +Release: 1 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -43,7 +43,7 @@ Requires: kbd Requires: util-linux >= 2.19 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 +Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch @@ -52,6 +52,7 @@ Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -66,7 +67,8 @@ drop-in replacement for sysvinit. License: GPLv2+ Group: System/Base Summary: Graphical front-end for systemd -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} + %description gtk Graphical front-end for systemd system and service manager. @@ -75,31 +77,36 @@ Graphical front-end for systemd system and service manager. License: GPLv2+ Group: System/Base Summary: System V init tools -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: sbin_init Conflicts: sysvinit Conflicts: upstart + %description sysvinit Drop-in replacement of System V init tools. %if %{build_plymouth} + %package plymouth License: GPLv2+ Group: System/Base Summary: Plymouth support for systemd -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires: plymouth + %description plymouth Plymouth integration for systemd %endif + %prep %setup -q %patch1 -p1 + %build autoreconf -fiv # prevent pre-generated and distributed files from re-building @@ -110,50 +117,52 @@ export V=1 --with-distro=suse \ --docdir=%{_docdir}/systemd \ --with-rootdir= \ - CFLAGS="$RPM_OPT_FLAGS" + CFLAGS="%{optflags}" # rebuild due to libnotify 0.7 in factory touch *.vala */*.vala make %{?_smp_mflags} + %install %makeinstall -find $RPM_BUILD_ROOT -type f -name '*.la' -exec rm -f {} ';' -mkdir -p $RPM_BUILD_ROOT/sbin -ln -s ../bin/systemd $RPM_BUILD_ROOT/sbin/init -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/reboot -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/halt -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/shutdown -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/poweroff -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit -ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel -rm -rf $RPM_BUILD_ROOT/etc/systemd/system/*.target.wants -rm -f $RPM_BUILD_ROOT/etc/systemd/system/default.target +find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' +mkdir -p %{buildroot}/sbin +ln -s ../bin/systemd %{buildroot}/sbin/init +ln -s ../bin/systemctl %{buildroot}/sbin/reboot +ln -s ../bin/systemctl %{buildroot}/sbin/halt +ln -s ../bin/systemctl %{buildroot}/sbin/shutdown +ln -s ../bin/systemctl %{buildroot}/sbin/poweroff +ln -s ../bin/systemctl %{buildroot}/sbin/telinit +ln -s ../bin/systemctl %{buildroot}/sbin/runlevel +rm -rf %{buildroot}/etc/systemd/system/*.target.wants +rm -f %{buildroot}/etc/systemd/system/default.target %if !%{build_plymouth} -rm -f $RPM_BUILD_ROOT/lib/systemd/system/plymouth-*.service -rm -f $RPM_BUILD_ROOT/lib/systemd/system/*.wants/plymouth-*.service -rm -f $RPM_BUILD_ROOT/lib/systemd/system/systemd-ask-password-plymouth.* +rm -f %{buildroot}/lib/systemd/system/plymouth-*.service +rm -f %{buildroot}/lib/systemd/system/*.wants/plymouth-*.service +rm -f %{buildroot}/lib/systemd/system/systemd-ask-password-plymouth.* %endif # aliases for /etc/init.d/* -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/cgroup.service -ln -s systemd-tmpfiles-setup.service $RPM_BUILD_ROOT/lib/systemd/system/cleanup.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/clock.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/crypto-early.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/earlysyslog.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/klog.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/ldconfig.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/loadmodules.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localfs.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/localnet.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/proc.service -ln -s fsck-root.service $RPM_BUILD_ROOT/lib/systemd/system/rootfsck.service -ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/swap.service -ln -s systemd-sysctl.service $RPM_BUILD_ROOT/lib/systemd/system/sysctl.service -ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service +ln -s /dev/null %{buildroot}/lib/systemd/system/cgroup.service +ln -s systemd-tmpfiles-setup.service %{buildroot}/lib/systemd/system/cleanup.service +ln -s /dev/null %{buildroot}/lib/systemd/system/clock.service +ln -s /dev/null %{buildroot}/lib/systemd/system/crypto.service +ln -s /dev/null %{buildroot}/lib/systemd/system/crypto-early.service +ln -s /dev/null %{buildroot}/lib/systemd/system/earlysyslog.service +ln -s /dev/null %{buildroot}/lib/systemd/system/klog.service +ln -s /dev/null %{buildroot}/lib/systemd/system/ldconfig.service +ln -s /dev/null %{buildroot}/lib/systemd/system/loadmodules.service +ln -s /dev/null %{buildroot}/lib/systemd/system/localfs.service +ln -s /dev/null %{buildroot}/lib/systemd/system/localnet.service +ln -s /dev/null %{buildroot}/lib/systemd/system/proc.service +ln -s fsck-root.service %{buildroot}/lib/systemd/system/rootfsck.service +ln -s /dev/null %{buildroot}/lib/systemd/system/swap.service +ln -s systemd-sysctl.service %{buildroot}/lib/systemd/system/sysctl.service +ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.service %if %{build_plymouth} -(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth +(cd %{buildroot} && find . -name '*plymouth*') > files.plymouth %endif + %post /bin/systemd-machine-id-setup >/dev/null 2>&1 || : /bin/systemctl daemon-reexec >/dev/null 2>&1 || : @@ -174,6 +183,7 @@ if [ "$1" -eq 1 ]; then remote-fs.target >/dev/null 2>&1 || : fi + %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ @@ -184,8 +194,10 @@ if [ $1 -eq 0 ]; then rm -f /etc/systemd/system/default.target 2>&1 || : fi + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} + %files %defattr(-,root,root) @@ -260,6 +272,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/bash_completion.d /etc/bash_completion.d/systemctl-bash-completion.sh + %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm @@ -268,6 +281,7 @@ rm -rf $RPM_BUILD_ROOT %if %{build_plymouth} + %files plymouth %defattr(-,root,root,-) /lib/systemd/system/plymouth-*.service @@ -275,6 +289,7 @@ rm -rf $RPM_BUILD_ROOT /lib/systemd/system/systemd-ask-password-plymouth.* %endif + %files sysvinit %defattr(-,root,root,-) /sbin/init @@ -292,4 +307,6 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* + + %changelog