Mailinglist Archive: opensuse-commit (1059 mails)
| < Previous | Next > |
commit avahi
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 30 Jan 2008 18:00:43 +0100
- Message-id: <20080130170043.C8548678335@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package avahi
checked in at Wed Jan 30 18:00:43 CET 2008.
--------
--- avahi/avahi.changes 2008-01-21 15:08:13.000000000 +0100
+++ avahi/avahi.changes 2008-01-30 17:13:57.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 30 17:13:23 CET 2008 - sbrabec@xxxxxxx
+
+- Fixed init scripts (bnc#332964).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ avahi-mono.spec ++++++
--- /var/tmp/diff_new_pack.u28766/_old 2008-01-30 17:57:29.000000000 +0100
+++ /var/tmp/diff_new_pack.u28766/_new 2008-01-30 17:57:29.000000000 +0100
@@ -15,7 +15,7 @@
%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
++++++ avahi.spec ++++++
--- /var/tmp/diff_new_pack.u28766/_old 2008-01-30 17:57:29.000000000 +0100
+++ /var/tmp/diff_new_pack.u28766/_new 2008-01-30 17:57:29.000000000 +0100
@@ -15,7 +15,7 @@
%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 @@
%endif
%changelog
+* Wed Jan 30 2008 sbrabec@xxxxxxx
+- Fixed init scripts (bnc#332964).
* Mon Jan 21 2008 ro@xxxxxxx
- same for libavahi-glib1 and libavahi-ui0
* Sun Jan 20 2008 ro@xxxxxxx
@@ -1102,7 +1104,7 @@
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@xxxxxxx
+* Thu Sep 06 2007 maw@xxxxxxx
- Move %%{_datadir}/pixmaps/gnome-nettool2.png from the python
subpackage to the base package (#299566).
* Wed Sep 05 2007 sbrabec@xxxxxxx
@@ -1154,7 +1156,7 @@
- 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@xxxxxxx
+* Sat Mar 10 2007 crivera@xxxxxxx
- 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 @@
- Added SuSEfirewall2 rule.
* Tue Feb 13 2007 sbrabec@xxxxxxx
- Do not build unusable static libraries (#238552#c17).
-* Wed Jan 31 2007 ro@xxxxxxx
+* Thu Feb 01 2007 ro@xxxxxxx
- removed gnome-nettool from BuildRequires (and Recommends)
(causes a build-cycle) and use local copy of the icon
* Fri Jan 26 2007 ro@xxxxxxx
++++++ avahi-bookmarks.init ++++++
--- avahi/avahi-bookmarks.init 2007-10-10 19:13:37.000000000 +0200
+++ avahi/avahi-bookmarks.init 2008-01-30 14:59:55.000000000 +0100
@@ -25,6 +25,18 @@
/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 @@
;;
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
++++++ avahi-init-lsb.patch ++++++
--- /var/tmp/diff_new_pack.u28766/_old 2008-01-30 17:57:30.000000000 +0100
+++ /var/tmp/diff_new_pack.u28766/_new 2008-01-30 17:57:30.000000000 +0100
@@ -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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |