packages: avahi/avahi.spec - rel 7 - merge systemd stuff into main package

[baggins]

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

---- Files affected:
packages/avahi:
   avahi.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.139 packages/avahi/avahi.spec:1.140
--- packages/avahi/avahi.spec:1.139	Sun Jan 22 22:23:22 2012
+++ packages/avahi/avahi.spec	Sun Feb  5 17:07:02 2012
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:		avahi
 Version:	0.6.30
-Release:	6
+Release:	7
 License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -98,6 +98,7 @@
 Requires:	dbus >= 0.92
 Requires:	libdaemon >= 0.14
 Requires:	rc-scripts >= 0.4.3
+Requires:	systemd-units >= 37-0.10
 Suggests:	nss_mdns >= 0.10-2
 Provides:	group(avahi)
 Provides:	user(avahi)
@@ -127,19 +128,6 @@
 %description upstart -l pl.UTF-8
 Opis zadań Upstart dla demonów Avahi.
 
-%package systemd
-Summary:	systemd units for Avahi daemons
-Summary(pl.UTF-8):	Pliki systemd dla demonów Avahi
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-Requires:	systemd-units >= 37-0.10
-
-%description systemd
-systemd units for Avahi daemons.
-
-%description systemd -l pl.UTF-8
-Pliki systemd dla demonów Avahi.
-
 %package autoipd
 Summary:	IPv4LL network address configuration daemon
 Summary(pl.UTF-8):	Demon configurujący adresy IPv4LL
@@ -742,6 +730,7 @@
 %service %{name}-daemon restart
 /sbin/chkconfig --add %{name}-dnsconfd
 %service %{name}-dnsconfd restart
+%systemd_post avahi-daemon.service avahi-dnsconfd.service avahi-daemon.socket
 
 %preun
 if [ "$1" = "0" ]; then
@@ -750,12 +739,17 @@
 	%service -q %{name}-daemon stop
 	/sbin/chkconfig --del %{name}-daemon
 fi
+%systemd_preun avahi-daemon.service avahi-dnsconfd.service avahi-daemon.socket
 
 %postun
 if [ "$1" = "0" ]; then
 	%userremove avahi
 	%groupremove avahi
 fi
+%systemd_reload
+
+%triggerpostun -- avahi < 0.6.30-7
+%systemd_trigger avahi-daemon.service avahi-dnsconfd.service avahi-daemon.socket
 
 %postun autoipd
 if [ "$1" = "0" ]; then
@@ -771,15 +765,6 @@
 %upstart_postun avahi-daemon
 %upstart_postun avahi-dnsconfd
 
-%post systemd
-%systemd_post avahi-daemon.service avahi-dnsconfd.service avahi-daemon.socket
-
-%preun systemd
-%systemd_preun avahi-daemon.service avahi-dnsconfd.service avahi-daemon.socket
-
-%postun systemd
-%systemd_reload
-
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -820,6 +805,11 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/services/sftp-ssh.service
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 
+%{systemdunitdir}/avahi-daemon.service
+%{systemdunitdir}/avahi-daemon.socket
+%{systemdunitdir}/avahi-dnsconfd.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
+
 %attr(755,root,root) %{_bindir}/avahi-set-host-name
 
 %attr(755,root,root) %{_sbindir}/avahi-daemon
@@ -849,13 +839,6 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/init/*.conf
 %endif
 
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/avahi-daemon.service
-%{systemdunitdir}/avahi-daemon.socket
-%{systemdunitdir}/avahi-dnsconfd.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
-
 %files autoipd
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/avahi
@@ -1126,6 +1109,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2012/02/05 16:07:02  baggins
+- rel 7
+- merge systemd stuff into main package
+
 Revision 1.139  2012/01/22 21:23:22  glen
 - upstart: fix dnsconfd dependency on avahi-daemon
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.139&r2=1.140&f=u