packages: avahi/avahi.spec - use systemd macros - rel. 4

[wiget]

Author: wiget                        Date: Sun Dec  4 17:55:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use systemd macros
- rel. 4

---- Files affected:
packages/avahi:
   avahi.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.136 packages/avahi/avahi.spec:1.137
--- packages/avahi/avahi.spec:1.136	Thu Dec  1 02:08:10 2011
+++ packages/avahi/avahi.spec	Sun Dec  4 18:55:45 2011
@@ -33,7 +33,7 @@
 Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:		avahi
 Version:	0.6.30
-Release:	3
+Release:	4
 License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -92,7 +92,7 @@
 BuildRequires:	qt4-build
 %endif
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.561
+BuildRequires:	rpmbuild(macros) >= 1.626
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus >= 0.92
@@ -128,12 +128,17 @@
 Opis zadań Upstart dla demonów Avahi.
 
 %package systemd
-Summary:	systemd units for avahi
-Group:		Base
+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.
+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
@@ -677,7 +682,7 @@
 	%{!?with_qt4:--disable-qt4} \
 	%{!?with_dotnet:--disable-mono} \
 	%{!?with_dotnet:--disable-monodoc} \
-	--with-systemdsystemunitdir=/lib/systemd/system \
+	--with-systemdsystemunitdir=%{systemdunitdir} \
 	--with-avahi-priv-access-group=adm \
 	--with-autoipd-user=avahi \
 	--with-autoipd-group=avahi
@@ -766,6 +771,15 @@
 %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
 
@@ -837,9 +851,9 @@
 
 %files systemd
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /lib/systemd/system/avahi-daemon.service
-%config(noreplace) %verify(not md5 mtime size) /lib/systemd/system/avahi-daemon.socket
-%config(noreplace) %verify(not md5 mtime size) /lib/systemd/system/avahi-dnsconfd.service
+%{systemdunitdir}/avahi-daemon.service
+%{systemdunitdir}/avahi-daemon.socket
+%{systemdunitdir}/avahi-dnsconfd.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
 
 %files autoipd
@@ -1112,6 +1126,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2011/12/04 17:55:45  wiget
+- use systemd macros
+- rel. 4
+
 Revision 1.136  2011/12/01 01:08:10  cactus
 - mv Avahi.service to systemd pkg
 
================================================================

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