rpms/avahi/devel .cvsignore, 1.6, 1.7 avahi-0.6.4-localtime.patch, 1.1, 1.2 avahi.spec, 1.32, 1.33 sources, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	.cvsignore avahi-0.6.4-localtime.patch avahi.spec sources 
Log Message:
- Upgrade to upstream version 0.6.5
- Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi
  package; copy system localtime into chroot in post



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Jan 2006 23:56:58 -0000	1.6
+++ .cvsignore	26 Jan 2006 18:11:34 -0000	1.7
@@ -3,3 +3,4 @@
 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.4-localtime.patch:
 avahi-daemon.in |    3 +++
 1 files changed, 3 insertions(+)

Index: avahi-0.6.4-localtime.patch
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.4-localtime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avahi-0.6.4-localtime.patch	24 Jan 2006 00:51:30 -0000	1.1
+++ avahi-0.6.4-localtime.patch	26 Jan 2006 18:11:34 -0000	1.2
@@ -1,12 +1,12 @@
---- avahi-0.6.4/initscript/fedora/avahi-daemon.in.localtime	2006-01-23 19:38:17.000000000 -0500
-+++ avahi-0.6.4/initscript/fedora/avahi-daemon.in	2006-01-23 19:43:55.000000000 -0500
+--- avahi-0.6.4/initscript/fedora/avahi-daemon.in.localtime	2006-01-23 19:44:16.000000000 -0500
++++ avahi-0.6.4/initscript/fedora/avahi-daemon.in	2006-01-26 12:34:30.000000000 -0500
 @@ -29,6 +29,9 @@
  
  start() {
  	echo -n $"Starting Avahi daemon... "
-+	mkdir -p /etc/avahi/etc >/dev/null 2>&1
-+	cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
-+	chcon system_u:object_r:locale_t /etc/avahi/etc/localtime >/dev/null 2>&1
++	if [ -s /etc/localtime ]; then
++	    cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1
++	fi;
          $AVAHI_BIN -D
  	RETVAL=$?
  	if [ $RETVAL = 0 ]; then


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- avahi.spec	24 Jan 2006 00:51:30 -0000	1.32
+++ avahi.spec	26 Jan 2006 18:11:34 -0000	1.33
@@ -3,8 +3,8 @@
 %define WITH_MONO 0
 %endif
 Name:           avahi
-Version:        0.6.4
-Release: 	4
+Version:        0.6.5
+Release: 	1
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -169,6 +169,10 @@
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
 rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/*
+#
+# Make /etc/avahi/etc/localtime owned by avahi:
+mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
+touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
 :;
 
 %clean
@@ -187,7 +191,10 @@
 	/sbin/chkconfig --add avahi-daemon >/dev/null 2>&1
    fi;
 #  We should realy make dbus reload the system.d config here. Dunno how though.
-#  kill -HUP `cat /var/run/messagebus.pid` ?   
+#  kill -HUP `cat /var/run/messagebus.pid` ? 
+   if [ -s /etc/localtime ]; then
+	cp -fp /etc/localtime /etc/avahi/etc/localtime || :;
+   fi;
 elif [ "$1" -gt 1 ]; then
    if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then
    # if user has not configured avahi service at all 
@@ -221,6 +228,8 @@
 %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service
 %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/avahi
+%dir %{_sysconfdir}/avahi/etc
+%ghost %{_sysconfdir}/avahi/etc/localtime
 %dir %{_sysconfdir}/avahi/services
 %dir %{_localstatedir}/run/avahi-daemon
 %config %{_sysconfdir}/avahi/avahi-daemon.conf
@@ -291,6 +300,11 @@
 %endif
 
 %changelog
+* Thu Jan 26 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.5-1
+- Upgrade to upstream version 0.6.5
+- Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi
+  package; copy system localtime into chroot in post
+
 * Mon Jan 23 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.4-4
 - fix bug 178689: copy localtime to chroot
 - fix bug 178784: fix avahi-dnsconfd initscript 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Jan 2006 23:56:58 -0000	1.6
+++ sources	26 Jan 2006 18:11:34 -0000	1.7
@@ -1 +1 @@
-12eb941043f26f82c51e99821ac52c44  avahi-0.6.4.tar.gz
+1ecbc3534e3b45cf15269a3f4cfe1dca  avahi-0.6.5.tar.gz