packages: avahi/avahi-daemon, avahi/avahi-dnsconfd, avahi/avahi.spec, avahi...

jajcus jajcus at pld-linux.org
Fri Jun 11 10:39:18 CEST 2010 

Author: jajcus                       Date: Fri Jun 11 08:39:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstart jobs
- use %py_* macros instead of random removes, so we don't get a *.py file with
  no *.py[co] packaged again.
- Release: 7

---- Files affected:
packages/avahi:
   avahi-daemon (1.9 -> 1.10) , avahi-dnsconfd (1.9 -> 1.10) , avahi.spec (1.111 -> 1.112) , avahi-daemon.upstart (NONE -> 1.1)  (NEW), avahi-dnsconfd.upstart (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/avahi/avahi-daemon
diff -u packages/avahi/avahi-daemon:1.9 packages/avahi/avahi-daemon:1.10
--- packages/avahi/avahi-daemon:1.9	Sat Feb 27 23:52:27 2010
+++ packages/avahi/avahi-daemon	Fri Jun 11 10:39:13 2010
@@ -76,6 +76,8 @@
 	start
 }
 
+upstart_controlled
+
 RETVAL=0
 # See how we were called.
 case "$1" in

================================================================
Index: packages/avahi/avahi-dnsconfd
diff -u packages/avahi/avahi-dnsconfd:1.9 packages/avahi/avahi-dnsconfd:1.10
--- packages/avahi/avahi-dnsconfd:1.9	Sat Feb 27 23:56:37 2010
+++ packages/avahi/avahi-dnsconfd	Fri Jun 11 10:39:13 2010
@@ -76,6 +76,7 @@
 	start
 }
 
+upstart_controlled
 
 # See how we were called.
 case "$1" in

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.111 packages/avahi/avahi.spec:1.112
--- packages/avahi/avahi.spec:1.111	Wed May 12 16:19:09 2010
+++ packages/avahi/avahi.spec	Fri Jun 11 10:39:13 2010
@@ -23,7 +23,7 @@
 Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:		avahi
 Version:	0.6.25
-Release:	6
+Release:	7
 License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -31,6 +31,8 @@
 Source1:	%{name}-daemon
 Source2:	%{name}-dnsconfd
 Source3:	%{name}.png
+Source4:	%{name}-daemon.upstart
+Source5:	%{name}-dnsconfd.upstart
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-glade.patch
 Patch2:		%{name}-destdir.patch
@@ -71,11 +73,12 @@
 BuildRequires:	qt4-build
 %endif
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpmbuild(macros) >= 1.561
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus >= 0.92
 Requires:	libdaemon >= 0.11
+Requires:	rc-scripts >= 0.4.3
 Suggests:	nss_mdns >= 0.10-2
 Provides:	group(avahi)
 Provides:	user(avahi)
@@ -91,6 +94,19 @@
 Multicast DNS dla Zeroconf Computing. Używa D-BUSa dla komunikacji
 pomiędzy programami użytkownika a demonem systemowym.
 
+%package upstart
+Summary:	Upstart jobs description for Avahi daemons
+Summary(pl.UTF-8):	Opis zadań Upstart dla demonów Avahi
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart jobs description for Avahi daemons.
+
+%description upstart -l pl.UTF-8
+Opis zadań Upstart dla demonów Avahi.
+
 %package autoipd
 Summary:	IPv4LL network address configuration daemon
 Summary(pl.UTF-8):	Demon configurujący adresy IPv4LL
@@ -584,7 +600,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d,/etc/init}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -593,14 +609,18 @@
 install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d
 cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/init/avahi-daemon.conf
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/avahi-dnsconfd.conf
+
 ln -sf %{_includedir}/avahi-compat-libdns_sd/dns_sd.h \
 	$RPM_BUILD_ROOT%{_includedir}/dns_sd.h
 
 ln -sf %{_pkgconfigdir}/avahi-compat-howl.pc \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}/howl.pc
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/avahi/{__init__,SimpleGladeApp}.py \
-	$RPM_BUILD_ROOT%{py_sitedir}/avahi_discover/*.py
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{avahi-{browse-domains,publish-address,publish-service,resolve-address,resolve-host-name},bvnc}.1
 echo '.so avahi-browse.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1
@@ -649,6 +669,14 @@
 	%groupremove avahi
 fi
 
+%post upstart
+%upstart_post avahi-daemon
+%upstart_post avahi-dnsconfd
+
+%postun upstart
+%upstart_postun avahi-daemon
+%upstart_postun avahi-dnsconfd
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -709,6 +737,10 @@
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/*.conf
+
 %files autoipd
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/avahi
@@ -949,6 +981,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112  2010/06/11 08:39:13  jajcus
+- upstart jobs
+- use %py_* macros instead of random removes, so we don't get a *.py file with
+  no *.py[co] packaged again.
+- Release: 7
+
 Revision 1.111  2010/05/12 14:19:09  baggins
 - rel 6
 - more desktop categories

================================================================
Index: packages/avahi/avahi-daemon.upstart
diff -u /dev/null packages/avahi/avahi-daemon.upstart:1.1
--- /dev/null	Fri Jun 11 10:39:18 2010
+++ packages/avahi/avahi-daemon.upstart	Fri Jun 11 10:39:13 2010
@@ -0,0 +1,16 @@
+description "Starts the Avahi daemon"
+
+start on pld.network-started and started SERVICE=syslog and started messagebus
+stop on pld.shutdown-started
+
+respawn
+
+console output
+
+pre-start script
+	modprobe capability || :
+end script
+
+exec /usr/sbin/avahi-daemon --syslog
+
+# vi: ft=upstart

================================================================
Index: packages/avahi/avahi-dnsconfd.upstart
diff -u /dev/null packages/avahi/avahi-dnsconfd.upstart:1.1
--- /dev/null	Fri Jun 11 10:39:18 2010
+++ packages/avahi/avahi-dnsconfd.upstart	Fri Jun 11 10:39:13 2010
@@ -0,0 +1,19 @@
+description "Starts the Avahi DNS conf daemon"
+
+start on started avahi-daemon
+stop on pld.shutdown-started
+
+respawn
+
+console output
+
+pre-start script
+	if [ ! -f /etc/avahi/dnsconfd.action ] ; then
+		logger -t 'init/avahi-dnsconfd' "Not configured - not starting"
+		/sbin/initctl stop
+	fi
+end script
+
+exec /usr/sbin/avahi-dnsconfd
+
+# vi: ft=upstart
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-daemon?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi-dnsconfd?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.111&r2=1.112&f=u

More information about the pld-cvs-commit mailing list