This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
7a7dc6addb
commit
37d665f443
@ -25,6 +25,18 @@ case "$1" in
|
||||
/sbin/killproc $AVAHI_BIN
|
||||
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
|
||||
@ -37,11 +49,11 @@ case "$1" in
|
||||
;;
|
||||
status)
|
||||
echo -n "Checking for Avahi Bookmarks server: "
|
||||
$AVAHI_BIN -c
|
||||
/sbin/checkproc $AVAHI_BIN
|
||||
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
|
||||
|
||||
@ -12,6 +12,34 @@
|
||||
# Description: Avahi, a ZeroConf daemon for mDNS and service registration
|
||||
### 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
|
||||
@@ -1,9 +1,10 @@
|
||||
@ -26,3 +54,31 @@
|
||||
# Description: Avahi, a ZeroConf daemon for mDNS and service registration
|
||||
### 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
|
||||
|
||||
@ -15,7 +15,7 @@ Name: avahi-mono
|
||||
%define build_mono 1
|
||||
# WARNING: Do not edit this auto generated file.
|
||||
Version: 0.6.22
|
||||
Release: 15
|
||||
Release: 18
|
||||
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
|
||||
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
%define avahi_client_soname 3
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
10
avahi.spec
10
avahi.spec
@ -15,7 +15,7 @@ Name: avahi
|
||||
%define build_mono 0
|
||||
# WARNING: After editing this file please call Re or rpmbuild to update spec files:
|
||||
Version: 0.6.22
|
||||
Release: 13
|
||||
Release: 16
|
||||
# WARNING: After changing versions please call Re or rpmbuild to auto-update spec file:
|
||||
#%(sh %{_sourcedir}/%{name}_spec-prepare.sh %{_sourcedir} %{name})
|
||||
%define avahi_client_soname 3
|
||||
@ -1060,6 +1060,8 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jan 30 2008 sbrabec@suse.cz
|
||||
- Fixed init scripts (bnc#332964).
|
||||
* Mon Jan 21 2008 ro@suse.de
|
||||
- same for libavahi-glib1 and libavahi-ui0
|
||||
* Sun Jan 20 2008 ro@suse.de
|
||||
@ -1102,7 +1104,7 @@ fi
|
||||
core on libglade2.
|
||||
- Split commands line utilities and GTK+ UI utilities to separate
|
||||
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
|
||||
subpackage to the base package (#299566).
|
||||
* Wed Sep 05 2007 sbrabec@suse.cz
|
||||
@ -1154,7 +1156,7 @@ fi
|
||||
- Rework the sub package split. There is a new package, avahi-python,
|
||||
that contains all of the Python utilities. This removes all Python
|
||||
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
|
||||
instead of /usr/share/SuSEfirewall2/services. This allows avahi
|
||||
to build again. This also depends on the latest dbus-1-python
|
||||
@ -1184,7 +1186,7 @@ fi
|
||||
- Added SuSEfirewall2 rule.
|
||||
* Tue Feb 13 2007 sbrabec@suse.cz
|
||||
- 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)
|
||||
(causes a build-cycle) and use local copy of the icon
|
||||
* Fri Jan 26 2007 ro@suse.de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user