Author: baggins Date: Sun Feb 5 16:29:13 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 5 - merge systemd stuff into main package
---- Files affected: packages/dbus: dbus.spec (1.226 -> 1.227) ---- Diffs: ================================================================ Index: packages/dbus/dbus.spec diff -u packages/dbus/dbus.spec:1.226 packages/dbus/dbus.spec:1.227 --- packages/dbus/dbus.spec:1.226 Tue Jan 31 12:51:02 2012 +++ packages/dbus/dbus.spec Sun Feb 5 17:29:08 2012 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Magistrala przesyłania komunikatów D-BUS Name: dbus Version: 1.4.16 -Release: 4 +Release: 5 License: AFL v2.1 or GPL v2 Group: Libraries Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz @@ -51,6 +51,7 @@ Requires: %{name}-libs = %{version}-%{release} Requires: expat >= %{expat_version} Requires: rc-scripts >= 0.4.3.0 +Requires: systemd-units >= 37-0.10 Provides: group(messagebus) Provides: user(messagebus) Obsoletes: dbus-glib-tools @@ -69,15 +70,6 @@ używany zarówno jako ogólnosystemowa usługa magistrali komunikatów jak i możliwość przesyłania komunikatów w ramach jednej sesji użytkownika. -%package systemd -Summary: systemd units for system message bus -Group: Daemons -Requires: %{name} = %{version}-%{release} -Requires: systemd-units >= 37-0.10 - -%description systemd -systemd units for system message bus. - %package upstart Summary: Upstart job description for system message bus Summary(pl.UTF-8): Opis zadania Upstart dla magistrali systemowej DBus @@ -218,6 +210,8 @@ %post /sbin/chkconfig --add messagebus %service messagebus restart "D-Bus daemon" +export NORESTART="yes" +%systemd_post messagebus.service %preun if [ "$1" = "0" ];then @@ -230,6 +224,17 @@ %userremove messagebus %groupremove messagebus fi +%systemd_reload + +%triggerpostun -- dbus < 1.4.16-5 +%systemd_trigger messagebus.service +if [ -f /etc/sysconfig/dbus ]; then + mv -f /etc/sysconfig/messagebus{,.rpmnew} + mv -f /etc/sysconfig/{dbus,messagebus} +elif [ -f /etc/sysconfig/dbus.rpmsave ]; then + mv -f /etc/sysconfig/messagebus{,.rpmnew} + mv -f /etc/sysconfig/{dbus.rpmsave,messagebus} +fi %if 0 %post upstart @@ -239,29 +244,9 @@ %upstart_postun messagebus %endif -%post systemd -%systemd_reload - -%postun systemd -%systemd_reload - %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%triggerpostun -- %{name} < 0.92 -%banner %{name} << EOF -WARNING!!! -configuration file /etc/sysconfig/dbus has been moved to /etc/sysconfig/messagebus! -EOF - -if [ -f /etc/sysconfig/dbus ]; then - mv -f /etc/sysconfig/messagebus{,.rpmnew} - mv -f /etc/sysconfig/{dbus,messagebus} -elif [ -f /etc/sysconfig/dbus.rpmsave ]; then - mv -f /etc/sysconfig/messagebus{,.rpmnew} - mv -f /etc/sysconfig/{dbus.rpmsave,messagebus} -fi - %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/dbus-cleanup-sockets @@ -287,8 +272,6 @@ %{_mandir}/man1/dbus-monitor.1* %{_mandir}/man1/dbus-send.1* -%files systemd -%defattr(644,root,root,755) %{systemdunitdir}/dbus.service %{systemdunitdir}/dbus.socket %{systemdunitdir}/dbus.target.wants/dbus.socket @@ -340,6 +323,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.227 2012/02/05 16:29:08 baggins +- rel 5 +- merge systemd stuff into main package + Revision 1.226 2012/01/31 11:51:02 baggins - release 4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/dbus.spec?r1=1.226&r2=1.227&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
