upgrade to 0.6.11; fix bugs 195674, 197414, 198282

This commit is contained in:
jvdias 2006-07-17 22:02:07 +00:00
parent 3dcebf74e9
commit 3c4ca9d69c
4 changed files with 38 additions and 6 deletions

View File

@ -9,3 +9,4 @@ avahi-0.6.7.tar.gz
avahi-0.6.8.tar.gz avahi-0.6.8.tar.gz
avahi-0.6.9.tar.gz avahi-0.6.9.tar.gz
avahi-0.6.10.tar.gz avahi-0.6.10.tar.gz
avahi-0.6.11.tar.gz

View File

@ -0,0 +1,11 @@
--- avahi-0.6.11/avahi-daemon/avahi-daemon.conf.use_ipv6_yes 2006-02-22 17:54:56.000000000 -0500
+++ avahi-0.6.11/avahi-daemon/avahi-daemon.conf 2006-07-17 17:34:08.000000000 -0400
@@ -25,7 +25,7 @@
#domain-name=local
browse-domains=0pointer.de, zeroconf.org
use-ipv4=yes
-use-ipv6=no
+use-ipv6=yes
#check-response-ttl=no
#use-iff-running=no
#enable-dbus=yes

View File

@ -5,8 +5,8 @@
%define WITH_MONO 0 %define WITH_MONO 0
%endif %endif
Name: avahi Name: avahi
Version: 0.6.10 Version: 0.6.11
Release: 3.FC6.1 Release: 1.fc6
Summary: Local network service discovery Summary: Local network service discovery
Group: System Environment/Base Group: System Environment/Base
License: LGPL License: LGPL
@ -52,6 +52,7 @@ Patch13: avahi-0.6.9-bz185972.patch
Patch14: avahi-0.6.9-bz189427.patch Patch14: avahi-0.6.9-bz189427.patch
Patch15: avahi-0.6.9-mono-libdir.patch Patch15: avahi-0.6.9-mono-libdir.patch
Patch16: avahi-sharp-lock.patch Patch16: avahi-sharp-lock.patch
Patch17: avahi-0.6.11-use-ipv6-yes.patch
%description %description
Avahi is a system which facilitates service discovery on Avahi is a system which facilitates service discovery on
@ -143,7 +144,7 @@ Libraries that are compatible with those provided by the howl package.
%package compat-howl-devel %package compat-howl-devel
Summary: Header files for development with the howl compatibility libraries. Summary: Header files for development with the howl compatibility libraries.
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version} Requires: avahi-compat-howl = %{version}
Obsoletes: howl-devel Obsoletes: howl-devel
%description compat-howl-devel %description compat-howl-devel
@ -160,7 +161,7 @@ Libraries for Apple Bonjour mDNSResponder compatibility.
%package compat-libdns_sd-devel %package compat-libdns_sd-devel
Summary: Header files for development with the Apple Bonjour mDNSResponder compatibility libraries. Summary: Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version} Requires: avahi-compat-libdns_sd = %{version}
%description compat-libdns_sd-devel %description compat-libdns_sd-devel
Header files for development with the Apple Bonjour mDNSResponder compatibility libraries. Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
@ -198,6 +199,7 @@ Header files for development with the Apple Bonjour mDNSResponder compatibility
%patch15 -p1 -b .mono-libdir %patch15 -p1 -b .mono-libdir
#%patch16 -p1 -b .sharp-lock #%patch16 -p1 -b .sharp-lock
#^- this patch now upstream #^- this patch now upstream
%patch17 -p1 -b .use-ipv6-yes
%build %build
# auto* update needed for avahi-0.5.2-fedora.patch # auto* update needed for avahi-0.5.2-fedora.patch
@ -253,6 +255,15 @@ touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime
if [ ! -e $RPM_BUILD_ROOT/%{_prefix}/lib/mono ] && [ -e $RPM_BUILD_ROOT/%{_libdir}/mono ]; then 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; mv -f $RPM_BUILD_ROOT/%{_libdir}/mono $RPM_BUILD_ROOT/%{_prefix}/lib;
fi 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
%endif
%if %{WITH_COMPAT_DNSSD}
ln -s avahi-compat-libdns_sd.pc $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libdns_sd.pc
ln -s avahi-compat-libdns_sd/dns_sd.h $RPM_BUILD_ROOT/%{_includedir}/
%endif
#
:; :;
%clean %clean
@ -382,6 +393,7 @@ fi
%attr(755,root,root) %{_libdir}/libhowl.so %attr(755,root,root) %{_libdir}/libhowl.so
%{_includedir}/avahi-compat-howl %{_includedir}/avahi-compat-howl
%{_libdir}/pkgconfig/avahi-compat-howl.pc %{_libdir}/pkgconfig/avahi-compat-howl.pc
%{_libdir}/pkgconfig/howl.pc
%endif %endif
%if %{WITH_COMPAT_DNSSD} %if %{WITH_COMPAT_DNSSD}
@ -393,11 +405,19 @@ fi
%defattr(0644, root, root, 0755) %defattr(0644, root, root, 0755)
%attr(755,root,root) %{_libdir}/libdns_sd.so %attr(755,root,root) %{_libdir}/libdns_sd.so
%{_includedir}/avahi-compat-libdns_sd %{_includedir}/avahi-compat-libdns_sd
%{_includedir}/dns_sd.h
%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc %{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
%{_libdir}/pkgconfig/libdns_sd.pc
%endif %endif
%changelog %changelog
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control * Mon Jul 17 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.11-1.fc6
- Upgrade to upstream version 0.6.11
- fix bug 195674: set 'use-ipv6=yes' in avahi-daemon.conf
- fix bug 197414: avahi-compat-howl and avahi-compat-dns-sd symlinks
- fix bug 198282: avahi-compat-{howl-devel,dns-sd-devel} Requires:
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com>
- rebuild - rebuild
* Tue Jun 13 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.10-3.FC6 * Tue Jun 13 2006 Jason Vas Dias <jvdias@redhat.com> - 0.6.10-3.FC6

View File

@ -1 +1 @@
cfb9e05c138dff4c430a35eee6229e8a avahi-0.6.10.tar.gz 91fd8cc0c2bae638848faad36cf1c032 avahi-0.6.11.tar.gz