- 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

Changed files:
    avahi-daemon -> 1.10
    avahi-daemon.upstart -> 1.1
    avahi-dnsconfd -> 1.10
    avahi-dnsconfd.upstart -> 1.1
    avahi.spec -> 1.112

diff --git a/avahi-daemon b/avahi-daemon
index 159066ee6cbfa31c5532b8e743c422b8fabb7fea..431b656f58984381617c7c0d8f67f675ac6d8f44 100644 (file)
--- a/avahi-daemon
+++ b/avahi-daemon
@@ -76,6 +76,8 @@ condrestart() {
        start
 }
 
+upstart_controlled
+
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/avahi-daemon.upstart b/avahi-daemon.upstart
new file mode 100644 (file)
index 0000000..5f0c685
--- /dev/null
+++ b/avahi-daemon.upstart
@@ -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

diff --git a/avahi-dnsconfd b/avahi-dnsconfd
index ce72ea4bd7f805b2a660a105803e5d61f9688a4e..6801610e03773e30329b7c36fd43b1b0156676a3 100644 (file)
--- a/avahi-dnsconfd
+++ b/avahi-dnsconfd
@@ -76,6 +76,7 @@ condrestart() {
        start
 }
 
+upstart_controlled
 
 # See how we were called.
 case "$1" in

diff --git a/avahi-dnsconfd.upstart b/avahi-dnsconfd.upstart
new file mode 100644 (file)
index 0000000..c2b8657
--- /dev/null
+++ b/avahi-dnsconfd.upstart
@@ -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

diff --git a/avahi.spec b/avahi.spec
index 9c661f3f270be8c134993049956d0209281830ec..d3633540e20c2417b28db994e940d8745231ac01 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -22,7 +22,7 @@ Summary:      Free mDNS/DNS-SD/Zeroconf implementation
 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
@@ -30,6 +30,8 @@ Source0:      http://avahi.org/download/%{name}-%{version}.tar.gz
 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
@@ -70,11 +72,12 @@ BuildRequires:      QtCore-devel
 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)
@@ -90,6 +93,19 @@ Avahi jest implementacją specyfikacji DNS Service Discovery i
 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
@@ -583,7 +599,7 @@ Narzędzia linii poleceń korzystające z avahi-client.
 
 %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 \
@@ -592,14 +608,18 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d}
 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
@@ -648,6 +668,14 @@ if [ "$1" = "0" ]; then
        %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
 
@@ -708,6 +736,10 @@ fi
 %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