packages: accountsservice/accountsservice.spec - rel 5 - merge systemd stuf...

[baggins]

Author: baggins                      Date: Sun Feb  5 16:03:14 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- merge systemd stuff into main package

---- Files affected:
packages/accountsservice:
   accountsservice.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/accountsservice/accountsservice.spec
diff -u packages/accountsservice/accountsservice.spec:1.19 packages/accountsservice/accountsservice.spec:1.20
--- packages/accountsservice/accountsservice.spec:1.19	Mon Jan 23 16:30:57 2012
+++ packages/accountsservice/accountsservice.spec	Sun Feb  5 17:03:09 2012
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Interfejs D-Bus do zarządzania kontami użytkowników
 Name:		accountsservice
 Version:	0.6.15
-Release:	4
+Release:	5
 License:	GPL v3
 Group:		Applications/System
 Source0:	http://cgit.freedesktop.org/accountsservice/snapshot/%{name}-%{version}.tar.bz2
@@ -21,10 +21,11 @@
 BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.102
-BuildRequires:	rpmbuild(macros) >= 1.629
+BuildRequires:	rpmbuild(macros) >= 1.641
 BuildRequires:	xmlto
 Requires:	ConsoleKit
 Requires:	polkit >= 0.102
+Requires:	systemd-units >= 0.38
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -41,15 +42,6 @@
 - Implementacje tych interfejsów oparte o komendy usermod(8),
   useradd(8) i userdel(8).
 
-%package systemd
-Summary:	systemd unit for accountsservice
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	systemd-units
-
-%description systemd
-systemd unit for accountsservice.
-
 %package devel
 Summary:	accountsservice includes, and more
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki accountsservice
@@ -108,15 +100,18 @@
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post systemd
+%post
 %systemd_post accounts-daemon.service
 
-%preun systemd
+%preun
 %systemd_preun accounts-daemon.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- accountsservice < 0.6.15-5
+%systemd_trigger accounts-daemon.service
+
 %files -f accounts-service.lang
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README TODO doc/dbus/AccountsService.html
@@ -125,16 +120,13 @@
 %attr(755,root,root) %ghost %{_libdir}/libaccountsservice.so.0
 %{_libdir}/girepository-1.0/AccountsService-1.0.typelib
 /etc/dbus-1/system.d/org.freedesktop.Accounts.conf
+%{systemdunitdir}/accounts-daemon.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Accounts.service
 %{_datadir}/polkit-1/actions/org.freedesktop.accounts.policy
 %dir /var/lib/AccountsService
 %dir /var/lib/AccountsService/icons
 %dir /var/lib/AccountsService/users
 
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/accounts-daemon.service
-
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libaccountsservice.so
@@ -154,6 +146,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2012/02/05 16:03:09  baggins
+- rel 5
+- merge systemd stuff into main package
+
 Revision 1.19  2012/01/23 15:30:57  megabajt
 - release 4 (rebuild with systemd macros without typo)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/accountsservice/accountsservice.spec?r1=1.19&r2=1.20&f=u