Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2013-03-23 07:40:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-workspace", Maintainer is "kde-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2013-03-14 11:28:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-03-23 07:40:55.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 21 03:48:04 UTC 2013 - crrodriguez@opensuse.org + +- Add a native systemd unit for ksysguardd and exclude + the old init scripts for newer distros. + +------------------------------------------------------------------- New: ---- ksysguardd.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.gLE8UJ/_old 2013-03-23 07:40:58.000000000 +0100 +++ /var/tmp/diff_new_pack.gLE8UJ/_new 2013-03-23 07:40:58.000000000 +0100 @@ -79,6 +79,7 @@ Source4: sysconfig.displaymanager-kdm Source5: kdm Source6: kdm-logrotate +Source7: ksysguardd.service Source91: %{name}-rpmlintrc Patch8: kwin-suse.diff Patch18: startkde.diff @@ -433,10 +434,14 @@ %suse_update_desktop_file kmenuedit Core-Configuration %suse_update_desktop_file -r klipper System TrayIcon %suse_update_desktop_file -r krandrtray System TrayIcon + mkdir -p %{buildroot}%{_kde4_sbindir} mkdir -p %{buildroot}%{_kde4_sysconfdir}/init.d + %if %{with_systemd} + install -D -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/ksysguardd.service + %else install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/ksysguardd - mkdir -p %{buildroot}%{_kde4_sbindir} ln -sf ../../etc/init.d/ksysguardd %{buildroot}%{_kde4_sbindir}/rcksysguardd + %endif ln -sf rcxdm %{buildroot}%{_kde4_sbindir}/rckdm mkdir -p %{buildroot}%{_kde4_sysconfdir}/logrotate.d/ install -m 644 %{SOURCE6} %{buildroot}%{_kde4_sysconfdir}/logrotate.d/kdm @@ -503,17 +508,35 @@ %post -n kdm-branding-upstream %{fillup_only -n displaymanager -s kdm} +%pre ksysguardd + +%if %{with_systemd} +%service_add_pre ksysguardd.service +%endif + %preun ksysguardd +%if %{with_systemd} +%service_del_preun ksysguardd.service +%else %stop_on_removal ksysguardd +%endif %post ksysguardd /sbin/ldconfig +%if %{with_systemd} +%service_add_post ksysguardd.service +%else %{fillup_and_insserv -f ksysguardd} +%endif %postun ksysguardd /sbin/ldconfig +%if %{with_systemd} +%service_del_postun ksysguardd.service +%else %restart_on_update ksysguardd %insserv_cleanup +%endif exit 0 %pre @@ -572,8 +595,12 @@ %files ksysguardd -f filelists/ksysguard %defattr(-,root,root) %doc COPYING COPYING.DOC README +%if %{with_systemd} +%{_unitdir}/ksysguardd.service +%else %config %{_kde4_sysconfdir}/init.d/ksysguardd %{_kde4_sbindir}/rcksysguardd +%endif %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc %config %{_kde4_configdir}/ksysguard.knsrc %{_kde4_bindir}/ksysguardd ++++++ ksysguardd.service ++++++ [Unit] Description=KDE ksysguard daemon [Service] Type=forking PIDFile=/var/run/ksysguardd.pid ExecStart=/usr/bin/ksysguardd -d PrivateTmp=true [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org