drop all Upstart hacks

Release: 9

diff --git a/avahi-daemon b/avahi-daemon
index 431b656f58984381617c7c0d8f67f675ac6d8f44..159066ee6cbfa31c5532b8e743c422b8fabb7fea 100644 (file)
--- a/avahi-daemon
+++ b/avahi-daemon
@@ -76,8 +76,6 @@ condrestart() {
        start
 }
 
        start
 }
 

-upstart_controlled
-

 RETVAL=0
 # See how we were called.
 case "$1" in
 RETVAL=0
 # See how we were called.
 case "$1" in

diff --git a/avahi-daemon.upstart b/avahi-daemon.upstart
deleted file mode 100644 (file)
index 99b0096..0000000
--- a/avahi-daemon.upstart
+++ /dev/null
@@ -1,21 +0,0 @@
-description "Starts the Avahi daemon"
-
-start on pld.network-started and started SERVICE_syslog=y and started messagebus
-stop on pld.shutdown-started
-
-respawn
-
-console output
-
-pre-start script
-       modprobe capability || :
-end script
-
-exec /usr/sbin/avahi-daemon --syslog
-
-# somewhy avahi does not remove pid itself which causes it to report on startup:
-# + exec /usr/sbin/avahi-daemon --syslog
-# Process 3383 died: No such process; trying to remove PID file. (/var/run/avahi-daemon//pid)
-post-stop script
-       rm -f /var/run/avahi-daemon/pid
-end script

diff --git a/avahi-dnsconfd b/avahi-dnsconfd
index 6801610e03773e30329b7c36fd43b1b0156676a3..cfc297987d890fdb00280f19dfbe0e6bd400626e 100644 (file)
--- a/avahi-dnsconfd
+++ b/avahi-dnsconfd
@@ -76,8 +76,6 @@ condrestart() {
        start
 }
 
        start
 }
 

-upstart_controlled
-

 # See how we were called.
 case "$1" in
   start)
 # See how we were called.
 case "$1" in
   start)

diff --git a/avahi-dnsconfd.upstart b/avahi-dnsconfd.upstart
deleted file mode 100644 (file)
index 0023a0a..0000000
--- a/avahi-dnsconfd.upstart
+++ /dev/null
@@ -1,17 +0,0 @@
-description "Starts the Avahi DNS conf daemon"
-
-start on started avahi-daemon
-stop on stopping avahi-daemon
-
-respawn
-
-console output
-
-pre-start script
-       if [ ! -f /etc/avahi/avahi-dnsconfd.action ]; then
-               logger -t 'init/avahi-dnsconfd' "Not configured - not starting"
-               /sbin/initctl -q stop
-       fi
-end script
-
-exec /usr/sbin/avahi-dnsconfd --syslog

diff --git a/avahi.spec b/avahi.spec
index 755f841d7f707d908c7fa7349301f054a3d57e30..41c4126014a30102b4b8af49babb5d640dc2c20c 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -33,7 +33,7 @@ Summary:      Free mDNS/DNS-SD/Zeroconf implementation
 Summary(pl.UTF-8):     Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:          avahi
 Version:       0.6.31
 Summary(pl.UTF-8):     Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:          avahi
 Version:       0.6.31

-Release:       8
+Release:       9

 License:       LGPL v2.1+
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
 License:       LGPL v2.1+
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz


@@ -41,8 +41,6 @@ Source0:      http://avahi.org/download/%{name}-%{version}.tar.gz
 Source1:       %{name}-daemon
 Source2:       %{name}-dnsconfd
 Source3:       %{name}.png
 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
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-glade.patch
 Patch2:                %{name}-destdir.patch


@@ -119,20 +117,6 @@ 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.
 
 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
-Conflicts:     syslog-ng-upstart < 3.2.4-1
-
-%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
 %package autoipd
 Summary:       IPv4LL network address configuration daemon
 Summary(pl.UTF-8):     Demon configurujący adresy IPv4LL


@@ -688,7 +672,7 @@ Narzędzia linii poleceń korzystające z avahi-client.
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d,/etc/init}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \


@@ -697,9 +681,6 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d,/etc/init}
 install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 

-cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/init/avahi-daemon.conf
-cp -p %{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 %{_includedir}/avahi-compat-libdns_sd/dns_sd.h \
        $RPM_BUILD_ROOT%{_includedir}/dns_sd.h
 


@@ -769,14 +750,6 @@ if [ "$1" = "0" ]; then
        %groupremove avahi
 fi
 
        %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
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 


@@ -843,12 +816,6 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 

-%if "%{pld_release}" != "ti"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/*.conf
-%endif
-

 %files autoipd
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/avahi
 %files autoipd
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/avahi