From b44bc32e12ecda293630b2eef4d925a80f6bccff4e58c1a426a997069e75b139 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 1 Aug 2011 14:36:43 +0000 Subject: [PATCH] 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