rpms/avahi/FC-6 avahi-0.6.15-initscript.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 avahi.spec, 1.70, 1.71 sources, 1.13, 1.14 avahi-0.6.11-dbus-deprecated.patch, 1.1, NONE avahi-0.6.11-initscript_desc.patch, 1.1, NONE avahi-0.6.7-initscript.patch, 1.2, NONE

Thu Nov 23 15:31:22 UTC 2006

Author: mbacovsk

Update of /cvs/dist/rpms/avahi/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv5857

Modified Files:
	.cvsignore avahi.spec sources 
Added Files:
	avahi-0.6.15-initscript.patch 
Removed Files:
	avahi-0.6.11-dbus-deprecated.patch 
	avahi-0.6.11-initscript_desc.patch 
	avahi-0.6.7-initscript.patch 
Log Message:
* Thu Nov 23 2006 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.15-1
- Upgrade to 0.6.15
- patches revision


avahi-0.6.15-initscript.patch:
 avahi-dnsconfd.in |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

--- NEW FILE avahi-0.6.15-initscript.patch ---
--- avahi-0.6.15/initscript/fedora/avahi-dnsconfd.in.initscript	2006-11-22 16:46:17.000000000 +0100
+++ avahi-0.6.15/initscript/fedora/avahi-dnsconfd.in	2006-11-22 16:50:32.000000000 +0100
@@ -2,10 +2,10 @@
 #
 # avahi-daemon:       Starts the Avahi dns configuration daemon
 #
-# chkconfig: - 34 98 02
-# description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script
-#       /etc/avahi/dnsconf.action for each unicast DNS server that is announced
-#       on the local LAN. This is useful for configuring unicast DNS servers in
+# chkconfig: - 98 02
+# description: avahi-dnsconfd connects to a running avahi-daemon and runs  the  script \
+#       /etc/avahi/dnsconf.action for each unicast DNS server that is announced \
+#       on the local LAN. This is useful for configuring unicast DNS servers in \
 #       a DHCP-like fashion with mDNS.
 # processname: avahi-dnsconfd
 # config: 
@@ -23,7 +23,7 @@
 AVAHI_BIN=@sbindir@/avahi-dnsconfd
 test -x $AVAHI_BIN || exit 5
 
-LOCKFILE=/var/lock/subsys/avahi-daemon
+LOCKFILE=/var/lock/subsys/avahi-dnsconfd
 
 start() {
 	echo -n $"Starting Avahi DNS daemon... "
@@ -40,7 +40,7 @@
 }
 
 stop() {
-        echo -n "Shutting down Avahi DNS daemon: "
+        echo -n $"Shutting down Avahi DNS daemon: "
         $AVAHI_BIN -k
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown"
@@ -50,7 +50,7 @@
 }
 
 reload() {
-        echo -n "Reloading Avahi DNS daemon... "
+        echo -n $"Reloading Avahi DNS daemon... "
         $AVAHI_BIN -r
 	RETVAL=$?
 	[ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup"
@@ -76,7 +76,7 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo "Avahi DNS daemon is running" || echo "Avahi DNS daemon is not running"
+	[ $? = 0 ] && echo $"Avahi DNS daemon is running" || echo $"Avahi DNS daemon is not running"
 	;;
   restart)
 	restart


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	17 Jul 2006 22:02:07 -0000	1.13
+++ .cvsignore	23 Nov 2006 15:31:20 -0000	1.14
@@ -1,12 +1 @@
-avahi-0.5.2.tar.gz
-avahi-0.6.tar.gz
-avahi-0.6.1.tar.gz
-avahi-0.6.3.tar.gz
-avahi-0.6.4.tar.gz
-avahi-0.6.5.tar.gz
-avahi-0.6.6.tar.gz
-avahi-0.6.7.tar.gz
-avahi-0.6.8.tar.gz
-avahi-0.6.9.tar.gz
-avahi-0.6.10.tar.gz
-avahi-0.6.11.tar.gz
+avahi-0.6.15.tar.gz


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/avahi.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- avahi.spec	18 Sep 2006 10:40:39 -0000	1.70
+++ avahi.spec	23 Nov 2006 15:31:20 -0000	1.71
@@ -5,13 +5,13 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.11
-Release: 	6%{?dist}
+Version:        0.6.15
+Release: 	    1%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
 URL:            http://avahi.org
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:	    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       dbus, libdaemon, expat, python, dbus-python, libcap
 Requires(post): initscripts, chkconfig, ldconfig
 BuildRequires:  autoconf
@@ -34,20 +34,19 @@
 %if %{WITH_MONO}
 BuildRequires:  mono-devel >= 1.1.13
 %endif
-Obsoletes:	howl
+Obsoletes:	    howl
 Source0:        %{name}-%{version}.tar.gz
 # enable mono's mcs to work in beehive buildroot:
-Patch6:         avahi-0.6.3-MONO_SHARED_DIR.patch
-Patch12:	avahi-0.6.7-initscript.patch
+Patch6:     avahi-0.6.3-MONO_SHARED_DIR.patch
 Patch13: 	avahi-0.6.9-bz185972.patch
 Patch14:	avahi-0.6.9-bz189427.patch
 Patch15:	avahi-0.6.9-mono-libdir.patch
 Patch17:	avahi-0.6.11-use-ipv6-yes.patch
-Patch18: 	avahi-0.6.11-dbus-deprecated.patch
-Patch19: 	avahi-0.6.11-param.patch
-Patch20: 	avahi-0.6.11-initscript_desc.patch
 Patch21: 	avahi-0.6.11-align.patch
 
+Patch20: 	avahi-0.6.15-initscript.patch
+
+
 %description
 Avahi is a system which facilitates service discovery on
 a local network -- this means that you can plug your laptop or
@@ -167,14 +166,11 @@
 %if %{WITH_MONO}
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
-%patch12 -p1 -b .initscript
 %patch13 -p1 -b .bz185972
 %patch14 -p1 -b .bz189427
 %patch15 -p1 -b .mono-libdir
 %patch17 -p1 -b .use-ipv6-yes
-%patch18 -p1 -b .dbus-deprecated
-%patch19 -p1 -b .param
-%patch20 -p1 -b .desc
+%patch20 -p1 -b .initscript
 %patch21 -p1 -b .align
 
 %build
@@ -300,6 +296,8 @@
 %attr(0755,avahi,avahi) %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
 %config %{_sysconfdir}/avahi/avahi-dnsconfd.action
+%config %{_sysconfdir}/avahi/avahi-autoipd.action
+%config %{_sysconfdir}/avahi/services/sftp-ssh.service
 %config %{_sysconfdir}/dbus-1/system.d/avahi-dbus.conf
 %attr(755,root,root) %{_sbindir}/*
 %attr(755,root,root) %{_libdir}/libavahi-common.so.*
@@ -387,6 +385,10 @@
 %endif
 
 %changelog
+* Thu Nov 23 2006 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.15-1
+- Upgrade to 0.6.15
+- patches revision
+
 * Mon Sep 18 2006 Martin Stransky <stransky at redhat.com> - 0.6.11-6
 - added patch from #206445 - ia64: unaligned access errors seen 
   during startup of avahi-daemon


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Jul 2006 22:02:07 -0000	1.13
+++ sources	23 Nov 2006 15:31:20 -0000	1.14
@@ -1 +1 @@
-91fd8cc0c2bae638848faad36cf1c032  avahi-0.6.11.tar.gz
+94dbd41336d18c47fc8213735a3fbf8e  avahi-0.6.15.tar.gz


--- avahi-0.6.11-dbus-deprecated.patch DELETED ---


--- avahi-0.6.11-initscript_desc.patch DELETED ---


--- avahi-0.6.7-initscript.patch DELETED ---


