removed sysv5 initscripts [release 0.6.31-8mamba;Sat Nov 15 2014]

avahi.spec

@@ -5,7 +5,7 @@
 
 Name:          avahi
 Version:       0.6.31
-Release:       7mamba
+Release:       8mamba
 Summary:       A system which facilitates service discovery on a local network
 Group:         Applications/Networking
 Vendor:        openmamba
@@ -273,6 +273,15 @@ ln -s avahi-compat-libdns_sd.pc %{buildroot}%{_libdir}/pkgconfig/libdns_sd.pc
 
 ln -s avahi-daemon.service %{buildroot}/lib/systemd/system/dbus-org.freedesktop.Avahi.service
 
+install -d %{buildroot}%{_presetdir}
+cat > %{buildroot}%{_presetdir}/50-avahi.preset << _EOF
+enable avahi-daemon.socket
+enable avahi-daemon.service
+enable avahi-dnsconfd.service
+_EOF
+
+rm -f %{buildroot}%{_initrddir}/avahi-{daemon,dnsconfd}
+
 %find_lang %{name}
 
 %clean
@@ -287,43 +296,44 @@ if [ $1 -ge 1 ]; then
    /usr/sbin/useradd -u %{avahiautoipduserid} -c 'Avahi autoipd user' -d /dev/null -g avahi-autoipd \
       -s /bin/false avahi-autoipd 2>/dev/null
 fi
-exit 0
+:
 
 %post
+rm -f %{sysconfdir}/rc*.d/avahi-{daemon,dnsconfd}
 if [ $1 -ge 1 ]; then
-   chkconfig --add avahi-daemon
-   chkconfig --add avahi-dnsconfd
-   service avahi-daemon start
-   service avahi-dnsconfd start
    grep "^hosts:.*mdns_minimal" %{_sysconfdir}/nsswitch.conf &>/dev/null || \
       sed -i "s|\(^hosts:.*files\) \(.*\)|\1 mdns_minimal [NOTFOUND=return] \2|" %{_sysconfdir}/nsswitch.conf
 fi
+%systemd_post avahi-daemon
+%systemd_post avahi-dnsconfd
 :
 
 %preun
+%systemd_preun avahi-daemon
+%systemd_preun avahi-dnsconfd
 if [ $1 -eq 0 ]; then
    /usr/sbin/groupdel avahi-autoipd 2>/dev/null
    /usr/sbin/userdel avahi-autoipd 2>/dev/null
    /usr/sbin/groupdel avahi 2>/dev/null
    /usr/sbin/userdel avahi 2>/dev/null
-   chkconfig --del avahi-daemon
-   chkconfig --del avahi-dnsconfd
-   service avahi-daemon stop
-   service avahi-dnsconfd stop
    grep "^hosts:.*mdns_minimal" %{_sysconfdir}/nsswitch.conf &>/dev/null && \
       sed -i "s| mdns_minimal [NOTFOUND=return]||" %{_sysconfdir}/nsswitch.conf
-
 fi
-exit 0
+:
+
+%postun
+%systemd_postun avahi-daemon
+%systemd_postun avahi-dnsconfd
+:
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_initrddir}/avahi-daemon
+%dir %{_sysconfdir}/avahi
-%{_initrddir}/avahi-dnsconfd
 %{_sysconfdir}/avahi/avahi-autoipd.action
 %{_sysconfdir}/avahi/avahi-daemon.conf
 %{_sysconfdir}/avahi/avahi-dnsconfd.action
 %{_sysconfdir}/avahi/hosts
+%dir %{_sysconfdir}/avahi/services
 %{_sysconfdir}/avahi/services/sftp-ssh.service
 %{_sysconfdir}/avahi/services/ssh.service
 %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
@@ -345,10 +355,11 @@ exit 0
 %{_sbindir}/avahi-autoipd
 %{_sbindir}/avahi-daemon
 %{_sbindir}/avahi-dnsconfd
-/lib/systemd/system/avahi-daemon.service
+%{_presetdir}/50-avahi.preset
-/lib/systemd/system/avahi-daemon.socket
+%{_unitdir}/avahi-daemon.service
-/lib/systemd/system/avahi-dnsconfd.service
+%{_unitdir}/avahi-daemon.socket
-/lib/systemd/system/dbus-org.freedesktop.Avahi.service
+%{_unitdir}/avahi-dnsconfd.service
+%{_unitdir}/dbus-org.freedesktop.Avahi.service
 %{_libdir}/avahi/service-types.db
 %{_datadir}/applications/avahi-discover.desktop
 %{_datadir}/applications/bssh.desktop
@@ -545,6 +556,9 @@ exit 0
 %{_libdir}/pkgconfig/libdns_sd.pc
 
 %changelog
+* Sat Nov 15 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.31-8mamba
+- removed sysv5 initscripts
+
 * Tue Nov 04 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 0.6.31-7mamba
 - avahi: require python-avahi for avahi-discover