From 463955367e35493b6abce52ae49da9a671dc45ffeb0294ff25a8910b08ec35e4 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 2 Aug 2011 07:39:24 +0000 Subject: [PATCH] Accepting request 77637 from Base:System Update to v32, split up devel project, adjust rpmlintrc OBS-URL: https://build.opensuse.org/request/show/77637 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=45 --- systemd-30.tar.bz2 | 3 --- systemd-32.tar.bz2 | 3 +++ systemd-rpmlintrc | 5 ++++- systemd.changes | 22 ++++++++++++++++++++++ systemd.spec | 35 ++++++++++++++++++++++++++++++++--- 5 files changed, 61 insertions(+), 7 deletions(-) delete mode 100644 systemd-30.tar.bz2 create mode 100644 systemd-32.tar.bz2 diff --git a/systemd-30.tar.bz2 b/systemd-30.tar.bz2 deleted file mode 100644 index ddfece5d..00000000 --- a/systemd-30.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:10f6fffe45fab4c2985267fad25781eb51aa07a216541443806cf7da7f616bb7 -size 868377 diff --git a/systemd-32.tar.bz2 b/systemd-32.tar.bz2 new file mode 100644 index 00000000..cf746355 --- /dev/null +++ b/systemd-32.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:714bd00ceb44639a675e8a7b7ee4f6bff42b70a442110c70e64ff41056828dae +size 877943 diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 59cfd1a7..cc21ff25 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -1,7 +1,10 @@ addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") addFilter(".*dangling-symlink .* /dev/null.*") -addFilter(".*devel-file-in-non-devel-package.*systemd.pc.*") addFilter(".*files-duplicate .*/reboot.8.*") addFilter(".*files-duplicate .*/sd_is_socket.3.*") +addFilter("non-conffile-in-etc /etc/bash_completion.d/systemctl-bash-completion.sh") addFilter(".*dbus-policy-allow-receive") +# Do not enable for submission into openSUSE:Factory, +# just for testing while polkit-default-privs is not checked in +# setBadness('polkit-unauthorized-privilege', 1) diff --git a/systemd.changes b/systemd.changes index 06bf6e11..fc42e955 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Aug 1 09:04:53 UTC 2011 - aj@suse.de + +- Split up devel package. +- restart logind after upgrade. +- Adjust rpmlintrc for changes. + +------------------------------------------------------------------- +Fri Jul 29 10:48:20 UTC 2011 - aj@suse.de + +- Update to version 32: + * bugfixes + * improve selinux setup + +------------------------------------------------------------------- +Thu Jul 28 07:27:32 UTC 2011 - aj@suse.de + +- Update to version 31: + * rewrite of enable/disable code: New features systemctl --runtime, + systemctl mask, systemctl link and presets. + * sd-daemon is now shared library. + ------------------------------------------------------------------- Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de diff --git a/systemd.spec b/systemd.spec index 2384823a..3a7e6a2a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,8 +21,8 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 30 -Release: 1 +Version: 32 +Release: 3 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -63,6 +63,16 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. +%package devel +License: GPLv2+ +Group: Development/Libraries/C and C++ +Summary: Development headers for systemd +Requires: %{name} = %{version} +Requires: pkg-config + +%description devel +Development headers and auxiliary files for developing applications for systemd. + %package gtk License: GPLv2+ Group: System/Base @@ -159,6 +169,7 @@ ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.se %post /bin/systemd-machine-id-setup >/dev/null 2>&1 || : /bin/systemctl daemon-reexec >/dev/null 2>&1 || : +/sbin/ldconfig # Create default config in /etc at first install. # Later package updates should not overwrite these settings. @@ -176,6 +187,12 @@ if [ "$1" -eq 1 ]; then remote-fs.target >/dev/null 2>&1 || : fi +%postun +/sbin/ldconfig +if [ $1 -ge 1 ] ; then + /bin/systemctl try-restart systemd-logind.service >/dev/null 2>&1 || : +fi + %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ @@ -202,6 +219,8 @@ rm -rf %{buildroot} /usr/bin/systemd-nspawn /usr/bin/systemd-stdio-bridge /usr/bin/systemd-analyze +%{_libdir}/libsystemd-daemon.so.* +%{_libdir}/libsystemd-login.so.* %{_bindir}/systemd-cgls /lib/systemd/systemd-* %dir /lib/systemd/system-shutdown @@ -242,7 +261,6 @@ rm -rf %{buildroot} %{_datadir}/polkit-1 %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy -%{_datadir}/pkgconfig/systemd.pc %if %{build_plymouth} # Packaged in plymouth subpackage %exclude /lib/systemd/system/plymouth-*.service @@ -281,6 +299,17 @@ rm -rf %{buildroot} %{_bindir}/systemd-gnome-ask-password-agent %{_mandir}/man1/systemadm.1* +%files devel +%defattr(-,root,root,-) +%{_libdir}/libsystemd-daemon.so +%{_libdir}/libsystemd-login.so +%dir %{_includedir}/systemd +%{_includedir}/systemd/sd-login.h +%{_includedir}/systemd/sd-daemon.h +%{_datadir}/pkgconfig/systemd.pc +%{_libdir}/pkgconfig/libsystemd-daemon.pc +%{_libdir}/pkgconfig/libsystemd-login.pc + %if %{build_plymouth} %files plymouth