From a091983a28292289f3f0822aaed6d5d9df06a870170bd5e57e957a429330b6f6 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 20 Jul 2011 07:13:18 +0000 Subject: [PATCH 1/5] Updating link to change in openSUSE:Factory/systemd revision 44.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=583876a837d9fcb2e85cf25bd57b8e23 --- systemd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index ea3e11e6..2384823a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -22,7 +22,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 30 -Release: 3 +Release: 1 License: GPLv2+ Group: System/Base Summary: A System and Session Manager From 1c83a910fd700210d3bd0414507e3c9b6ed299689299cc09b2fa5f3c5bdf23b8 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 28 Jul 2011 10:59:10 +0000 Subject: [PATCH 2/5] Accepting request 77329 from home:a_jaeger:branches:openSUSE:Factory Update to v31 - to not push into factory yet OBS-URL: https://build.opensuse.org/request/show/77329 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=163 --- systemd-30.tar.bz2 | 3 --- systemd-31.tar.bz2 | 3 +++ systemd-rpmlintrc | 4 +++- systemd.changes | 8 ++++++++ systemd.spec | 18 +++++++++++++++--- 5 files changed, 29 insertions(+), 7 deletions(-) delete mode 100644 systemd-30.tar.bz2 create mode 100644 systemd-31.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-31.tar.bz2 b/systemd-31.tar.bz2 new file mode 100644 index 00000000..6e5d49f0 --- /dev/null +++ b/systemd-31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:63475cecd244a4b30ae83ecee3bf2c5f353f12f9f33a2026e218dbfd7d6afd46 +size 877404 diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 59cfd1a7..52cf4c05 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -4,4 +4,6 @@ addFilter(".*devel-file-in-non-devel-package.*systemd.pc.*") addFilter(".*files-duplicate .*/reboot.8.*") addFilter(".*files-duplicate .*/sd_is_socket.3.*") addFilter(".*dbus-policy-allow-receive") - +# Do not enable for submission into openSUSE:Factory, +# just for testing +setBadness('polkit-unauthorized-privilege', 1) \ No newline at end of file diff --git a/systemd.changes b/systemd.changes index 06bf6e11..a35c294b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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..1b7a4ac0 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: 31 +Release: 3 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -159,6 +159,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 +177,8 @@ if [ "$1" -eq 1 ]; then remote-fs.target >/dev/null 2>&1 || : fi +%postun -p /sbin/ldconfig + %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ @@ -202,6 +205,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 +247,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 @@ -274,6 +278,14 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/bash_completion.d /etc/bash_completion.d/systemctl-bash-completion.sh +# The following files might go into a devel package +%{_includedir}/systemd/ +%{_datadir}/pkgconfig/systemd.pc +%{_libdir}/pkgconfig/libsystemd-daemon.pc +%{_libdir}/pkgconfig/libsystemd-login.pc +%{_libdir}/libsystemd-daemon.so +%{_libdir}/libsystemd-login.so + %files gtk %defattr(-,root,root,-) From fd0249b9eedc25be940c857132bd629c2898f392622deb530261f98be07cc0af Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 28 Jul 2011 14:53:43 +0000 Subject: [PATCH 3/5] Accepting request 77358 from home:a_jaeger:branches:openSUSE:Factory Adjust rpmlintrc since polkit-default-privs is changed. OBS-URL: https://build.opensuse.org/request/show/77358 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=164 --- systemd-rpmlintrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 52cf4c05..96bccc7a 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -5,5 +5,6 @@ addFilter(".*files-duplicate .*/reboot.8.*") addFilter(".*files-duplicate .*/sd_is_socket.3.*") addFilter(".*dbus-policy-allow-receive") # Do not enable for submission into openSUSE:Factory, -# just for testing -setBadness('polkit-unauthorized-privilege', 1) \ No newline at end of file +# just for testing while polkit-default-privs is not checked in +# setBadness('polkit-unauthorized-privilege', 1) + From 7123360fa591f05a6e93315fb45e8e2e11cf7a05671dd8317974c5ab97d77b28 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Fri, 29 Jul 2011 10:56:12 +0000 Subject: [PATCH 4/5] Accepting request 77420 from home:a_jaeger:branches:openSUSE:Factory Update to v32 OBS-URL: https://build.opensuse.org/request/show/77420 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=165 --- systemd-31.tar.bz2 | 3 --- systemd-32.tar.bz2 | 3 +++ systemd.changes | 7 +++++++ systemd.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 systemd-31.tar.bz2 create mode 100644 systemd-32.tar.bz2 diff --git a/systemd-31.tar.bz2 b/systemd-31.tar.bz2 deleted file mode 100644 index 6e5d49f0..00000000 --- a/systemd-31.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63475cecd244a4b30ae83ecee3bf2c5f353f12f9f33a2026e218dbfd7d6afd46 -size 877404 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.changes b/systemd.changes index a35c294b..2e403ded 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/systemd.spec b/systemd.spec index 1b7a4ac0..54706b33 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 31 +Version: 32 Release: 3 License: GPLv2+ Group: System/Base From 4926361ec473743fa727424401b24fe5b4a4b78ac3f7079ab9e9cedece97487b Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 1 Aug 2011 14:36:43 +0000 Subject: [PATCH 5/5] Accepting request 77549 from home:a_jaeger:branches:openSUSE:Factory Adjust rpmlintrc OBS-URL: https://build.opensuse.org/request/show/77549 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=166 --- systemd-rpmlintrc | 2 +- systemd.changes | 7 +++++++ systemd.spec | 35 ++++++++++++++++++++++++++--------- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 96bccc7a..cc21ff25 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -1,8 +1,8 @@ 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 diff --git a/systemd.changes b/systemd.changes index 2e403ded..fc42e955 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/systemd.spec b/systemd.spec index 54706b33..3a7e6a2a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -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 @@ -177,7 +187,11 @@ if [ "$1" -eq 1 ]; then remote-fs.target >/dev/null 2>&1 || : fi -%postun -p /sbin/ldconfig +%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 @@ -278,14 +292,6 @@ rm -rf %{buildroot} %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/bash_completion.d /etc/bash_completion.d/systemctl-bash-completion.sh -# The following files might go into a devel package -%{_includedir}/systemd/ -%{_datadir}/pkgconfig/systemd.pc -%{_libdir}/pkgconfig/libsystemd-daemon.pc -%{_libdir}/pkgconfig/libsystemd-login.pc -%{_libdir}/libsystemd-daemon.so -%{_libdir}/libsystemd-login.so - %files gtk %defattr(-,root,root,-) @@ -293,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