rpms/avahi/FC-6 avahi-0.6.16-status-ec.patch, NONE, 1.1 avahi.spec, 1.74, 1.75

[fedora-cvs-commits at redhat.com]

Author: mbacovsk

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

Modified Files:
	avahi.spec 
Added Files:
	avahi-0.6.16-status-ec.patch 
Log Message:
* Wed Apr 11 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-4
- resolves: #185692: avahi-sharp installs into wrong location for x86-64
- resolves: #220267: avahi-qt3.pc depends on qt-mt.pc but the rpm does not
- resolves: #237844: command service avahi-daemon status returns wrong value


avahi-0.6.16-status-ec.patch:
 avahi-daemon.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE avahi-0.6.16-status-ec.patch ---
--- avahi-0.6.16/initscript/fedora/avahi-daemon.in.status-ec	2007-04-26 11:59:05.000000000 +0200
+++ avahi-0.6.16/initscript/fedora/avahi-daemon.in	2007-04-26 11:59:42.000000000 +0200
@@ -80,7 +80,7 @@
 	;;
   status)
         $AVAHI_BIN -c
-	[ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running"
+	[ $? = 0 ] && echo $"Avahi daemon is running" || ( echo $"Avahi daemon is not running" ; exit 1 )
 	;;
   restart)
 	restart


Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-6/avahi.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- avahi.spec	30 Mar 2007 20:00:42 -0000	1.74
+++ avahi.spec	26 Apr 2007 10:13:17 -0000	1.75
@@ -6,7 +6,7 @@
 %endif
 Name:           avahi
 Version:        0.6.16
-Release: 	    3%{?dist}
+Release: 	    4%{?dist}
 Summary:        Local network service discovery 
 Group:          System Environment/Base
 License:        LGPL
@@ -39,12 +39,12 @@
 # enable mono's mcs to work in beehive buildroot:
 Patch6:     avahi-0.6.3-MONO_SHARED_DIR.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
 Patch20: 	avahi-0.6.15-initscript.patch
 Patch21: 	avahi-0.6.11-align.patch
 Patch23:    avahi-0.6.15-netdev.patch
 Patch24: 	avahi-0.6.16-register-time-event.patch
+Patch25:	avahi-0.6.16-status-ec.patch
 
 
 %description
@@ -166,12 +166,12 @@
 %patch6 -p1 -b .MONO_SHARED_DIR
 %endif
 %patch14 -p1 -b .bz189427
-%patch15 -p1 -b .mono-libdir
 %patch17 -p1 -b .use-ipv6-yes
 %patch20 -p1 -b .initscript
 %patch21 -p1 -b .align
 %patch23 -p1 -b .netdev
 %patch24 -p0 -b .register-time-event
+%patch25 -p1 -b .status-ec
 
 %build
 # auto* update needed for avahi-0.5.2-fedora.patch
@@ -223,10 +223,6 @@
 mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc
 touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
 #
-# Fix avahi-sharp default installation into /usr/lib64 on x86_64:
-if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e  $RPM_BUILD_ROOT/%{_libdir}/mono ]; then
-   mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib; 
-fi
 # fix bug 197414 - add missing symlinks for avahi-compat-howl and avahi-compat-dns-sd
 %if %{WITH_COMPAT_HOWL}
 ln -s avahi-compat-howl.pc  $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/howl.pc 
@@ -342,18 +338,18 @@
 %files qt3
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so.*
-%{_libdir}/pkgconfig/avahi-qt3.pc
 
 %files qt3-devel
 %defattr(0644, root, root, 0755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so
 %{_includedir}/avahi-qt3
+%{_libdir}/pkgconfig/avahi-qt3.pc
 
 %if %{WITH_MONO}
 %files sharp
 %defattr(0644, root, root, 0755)
-%{_prefix}/lib/mono/avahi-sharp
-%{_prefix}/lib/mono/gac/avahi-sharp
+%{_libdir}/mono/avahi-sharp
+%{_libdir}/mono/gac/avahi-sharp
 %{_libdir}/pkgconfig/avahi-sharp.pc
 %endif
 
@@ -385,14 +381,19 @@
 %endif
 
 %changelog
-* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3.fc6
+* Wed Apr 11 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-4
+- resolves: #185692: avahi-sharp installs into wrong location for x86-64
+- resolves: #220267: avahi-qt3.pc depends on qt-mt.pc but the rpm does not
+- resolves: #237844: command service avahi-daemon status returns wrong value
+
+* Fri Mar 30 2007 Dan Williams <dcbw at redhat.com> - 0.6.16-3
 - Fix race condition during conflict state that triggers an assertion
     http://www.avahi.org/changeset/1400
 
-* Tue Jan 16 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-2.fc6
+* Tue Jan 16 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-2
 - Resolves: #219218 - avahi package does not create group "netdev"
 
-* Sun Jan  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-1.fc6
+* Sun Jan  7 2007 Martin Bacovsky <mbacovsk at redhat.com> - 0.6.16-1
 - Resolves: #221440 - CVE-2006-6870 Maliciously crafted packed can DoS avahi daemon
 - Resolves: #219218 - avahi package does not create group "netdev"