OBS User unknown
2008-01-30 17:00:45 +00:00
committed by Git OBS Bridge
parent 7a7dc6addb
commit 37d665f443
5 changed files with 82 additions and 7 deletions

View File

@@ -25,6 +25,18 @@ case "$1" in
/sbin/killproc $AVAHI_BIN /sbin/killproc $AVAHI_BIN
rc_status -v rc_status -v
;; ;;
try-restart|condrestart)
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset
fi
rc_status
;;
restart) restart)
$0 stop $0 stop
$0 start $0 start
@@ -37,11 +49,11 @@ case "$1" in
;; ;;
status) status)
echo -n "Checking for Avahi Bookmarks server: " echo -n "Checking for Avahi Bookmarks server: "
$AVAHI_BIN -c /sbin/checkproc $AVAHI_BIN
rc_status -v rc_status -v
;; ;;
*) *)
echo "Usage: $0 {start|stop|status|restart|force-reload|reload}" echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1 exit 1
;; ;;
esac esac

View File

@@ -12,6 +12,34 @@
# Description: Avahi, a ZeroConf daemon for mDNS and service registration # Description: Avahi, a ZeroConf daemon for mDNS and service registration
### END INIT INFO ### END INIT INFO
@@ -33,6 +34,18 @@
$AVAHI_BIN -k || /bin/true
rc_status -v
;;
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
+ fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
+ ;;
restart)
$0 stop
$0 start
@@ -49,7 +62,7 @@
rc_status -v
;;
*)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
--- initscript/suse/avahi-dnsconfd.in --- initscript/suse/avahi-dnsconfd.in
+++ initscript/suse/avahi-dnsconfd.in +++ initscript/suse/avahi-dnsconfd.in
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
@@ -26,3 +54,31 @@
# Description: Avahi, a ZeroConf daemon for mDNS and service registration # Description: Avahi, a ZeroConf daemon for mDNS and service registration
### END INIT INFO ### END INIT INFO
@@ -24,6 +25,18 @@
$AVAHI_BIN -k || /bin/true
rc_status -v
;;
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
+ fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
+ ;;
restart)
$0 stop
$0 start
@@ -40,7 +53,7 @@
rc_status -v
;;
*)
- echo "Usage: $0 {start|stop|status|restart|force-reload|reload}"
+ echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac

View File

@@ -15,7 +15,7 @@ Name: avahi-mono
%define build_mono 1 %define build_mono 1
# WARNING: Do not edit this auto generated file. # WARNING: Do not edit this auto generated file.
Version: 0.6.22 Version: 0.6.22
Release: 15 Release: 18
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
%define avahi_client_soname 3 %define avahi_client_soname 3

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jan 30 17:13:23 CET 2008 - sbrabec@suse.cz
- Fixed init scripts (bnc#332964).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 21 15:08:05 CET 2008 - ro@suse.de Mon Jan 21 15:08:05 CET 2008 - ro@suse.de

View File

@@ -15,7 +15,7 @@ Name: avahi
%define build_mono 0 %define build_mono 0
# WARNING: After editing this file please call Re or rpmbuild to update spec files: # WARNING: After editing this file please call Re or rpmbuild to update spec files:
Version: 0.6.22 Version: 0.6.22
Release: 13 Release: 16
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
%define avahi_client_soname 3 %define avahi_client_soname 3
@@ -1060,6 +1060,8 @@ fi
%endif %endif
%changelog %changelog
* Wed Jan 30 2008 sbrabec@suse.cz
- Fixed init scripts (bnc#332964).
* Mon Jan 21 2008 ro@suse.de * Mon Jan 21 2008 ro@suse.de
- same for libavahi-glib1 and libavahi-ui0 - same for libavahi-glib1 and libavahi-ui0
* Sun Jan 20 2008 ro@suse.de * Sun Jan 20 2008 ro@suse.de
@@ -1102,7 +1104,7 @@ fi
core on libglade2. core on libglade2.
- Split commands line utilities and GTK+ UI utilities to separate - Split commands line utilities and GTK+ UI utilities to separate
packages to not force them for daemon or Qt binding users. packages to not force them for daemon or Qt binding users.
* Wed Sep 05 2007 maw@suse.de * Thu Sep 06 2007 maw@suse.de
- Move %%{_datadir}/pixmaps/gnome-nettool2.png from the python - Move %%{_datadir}/pixmaps/gnome-nettool2.png from the python
subpackage to the base package (#299566). subpackage to the base package (#299566).
* Wed Sep 05 2007 sbrabec@suse.cz * Wed Sep 05 2007 sbrabec@suse.cz
@@ -1154,7 +1156,7 @@ fi
- Rework the sub package split. There is a new package, avahi-python, - Rework the sub package split. There is a new package, avahi-python,
that contains all of the Python utilities. This removes all Python that contains all of the Python utilities. This removes all Python
dependencies from the base avahi package. This fixes 245390. dependencies from the base avahi package. This fixes 245390.
* Fri Mar 09 2007 crivera@suse.de * Sat Mar 10 2007 crivera@suse.de
- Install avahi.firewill in /etc/sysconfig/SuSEfirewall2.d/services - Install avahi.firewill in /etc/sysconfig/SuSEfirewall2.d/services
instead of /usr/share/SuSEfirewall2/services. This allows avahi instead of /usr/share/SuSEfirewall2/services. This allows avahi
to build again. This also depends on the latest dbus-1-python to build again. This also depends on the latest dbus-1-python
@@ -1184,7 +1186,7 @@ fi
- Added SuSEfirewall2 rule. - Added SuSEfirewall2 rule.
* Tue Feb 13 2007 sbrabec@suse.cz * Tue Feb 13 2007 sbrabec@suse.cz
- Do not build unusable static libraries (#238552#c17). - Do not build unusable static libraries (#238552#c17).
* Wed Jan 31 2007 ro@suse.de * Thu Feb 01 2007 ro@suse.de
- removed gnome-nettool from BuildRequires (and Recommends) - removed gnome-nettool from BuildRequires (and Recommends)
(causes a build-cycle) and use local copy of the icon (causes a build-cycle) and use local copy of the icon
* Fri Jan 26 2007 ro@suse.de * Fri Jan 26 2007 ro@suse.de