rpms/avahi/FC-5 .cvsignore, 1.12, 1.13 avahi.spec, 1.50, 1.51 sources, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jul 17 22:33:11 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/avahi/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv9778
Modified Files:
.cvsignore avahi.spec sources
Log Message:
upgrade to 0.6.11; fix bugs 195674, 197414, 198282
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 6 Jun 2006 18:28:25 -0000 1.12
+++ .cvsignore 17 Jul 2006 22:32:56 -0000 1.13
@@ -9,3 +9,4 @@
avahi-0.6.8.tar.gz
avahi-0.6.9.tar.gz
avahi-0.6.10.tar.gz
+avahi-0.6.11.tar.gz
Index: avahi.spec
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/avahi.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- avahi.spec 6 Jun 2006 23:20:16 -0000 1.50
+++ avahi.spec 17 Jul 2006 22:32:58 -0000 1.51
@@ -1,23 +1,38 @@
%{?!WITH_MONO: %define WITH_MONO 1}
%{?!WITH_COMPAT_DNSSD: %define WITH_COMPAT_DNSSD 1}
%{?!WITH_COMPAT_HOWL: %define WITH_COMPAT_HOWL 1}
-%ifarch ppc64
+%ifarch ppc64 s390 s390x
%define WITH_MONO 0
%endif
Name: avahi
-Version: 0.6.10
-Release: 1.FC5
+Version: 0.6.11
+Release: 1.fc5
Summary: Local network service discovery
Group: System Environment/Base
License: LGPL
URL: http://avahi.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf, automake, libtool, doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, libxml2-python, gdbm-devel, pygtk2
-%if %{WITH_MONO}
-BuildRequires: mono-devel >= 1.1.13
-%endif
Requires: dbus, libdaemon, expat, python, dbus-python, libcap
Requires(post): initscripts, chkconfig, ldconfig
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+BuildRequires: dbus-devel
+BuildRequires: dbus-python
+BuildRequires: libxml2-python
+BuildRequires: gtk2-devel
+BuildRequires: qt-devel
+BuildRequires: libglade2-devel
+BuildRequires: libdaemon-devel
+BuildRequires: glib2-devel
+BuildRequires: libcap-devel
+BuildRequires: expat-devel
+BuildRequires: python
+BuildRequires: gdbm-devel
+BuildRequires: pygtk2
+%if %{WITH_MONO}
+BuildRequires: mono-devel >= 1.1.13
+%endif
Obsoletes: howl
Source0: %{name}-%{version}.tar.gz
Patch1: avahi-0.5.2-fedora.patch
@@ -37,6 +52,7 @@
Patch14: avahi-0.6.9-bz189427.patch
Patch15: avahi-0.6.9-mono-libdir.patch
Patch16: avahi-sharp-lock.patch
+Patch17: avahi-0.6.11-use-ipv6-yes.patch
%description
Avahi is a system which facilitates service discovery on
@@ -128,7 +144,7 @@
%package compat-howl-devel
Summary: Header files for development with the howl compatibility libraries.
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: avahi-compat-howl = %{version}
Obsoletes: howl-devel
%description compat-howl-devel
@@ -145,7 +161,7 @@
%package compat-libdns_sd-devel
Summary: Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
Group: Development/Libraries
-Requires: %{name} = %{version}
+Requires: avahi-compat-libdns_sd = %{version}
%description compat-libdns_sd-devel
Header files for development with the Apple Bonjour mDNSResponder compatibility libraries.
@@ -183,6 +199,7 @@
%patch15 -p1 -b .mono-libdir
#%patch16 -p1 -b .sharp-lock
#^- this patch now upstream
+%patch17 -p1 -b .use-ipv6-yes
%build
# auto* update needed for avahi-0.5.2-fedora.patch
@@ -238,6 +255,15 @@
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
+%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
@@ -367,6 +393,7 @@
%attr(755,root,root) %{_libdir}/libhowl.so
%{_includedir}/avahi-compat-howl
%{_libdir}/pkgconfig/avahi-compat-howl.pc
+%{_libdir}/pkgconfig/howl.pc
%endif
%if %{WITH_COMPAT_DNSSD}
@@ -378,25 +405,36 @@
%defattr(0644, root, root, 0755)
%attr(755,root,root) %{_libdir}/libdns_sd.so
%{_includedir}/avahi-compat-libdns_sd
+%{_includedir}/dns_sd.h
%{_libdir}/pkgconfig/avahi-compat-libdns_sd.pc
+%{_libdir}/pkgconfig/libdns_sd.pc
%endif
%changelog
-* Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2.FC6
+* Mon Jul 17 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.11-1
+- 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:
+
+* Tue Jun 13 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-3
+- rebuild for broken mono deps
+
+* Tue Jun 06 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-2
- fix bug 194203: fix permissions on /var/run/avahi-daemon
-* Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-1.FC6
+* Tue May 30 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.10-1
- Upgrade to upstream version 0.6.10
- fix bug 192080: split avahi-compat-libdns_sd into separate package
(same goes for avahi-compat-howl)
-* Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+* Tue May 02 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9
- fix avahi-sharp issues for banshee - patches from caillon at redhat.com
-* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9.FC6
+* Thu Apr 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-9
- fix bug 189427: correct avahi-resolve --help typo
-* Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8.FC6
+* Mon Mar 20 2006 Jason Vas Dias <jvdias at redhat.com> - 0.6.9-8
- fix bug 185972: remove ellipses in initscript
- fix bug 185965: make chkconfigs unconditional
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/avahi/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 6 Jun 2006 18:28:25 -0000 1.12
+++ sources 17 Jul 2006 22:32:58 -0000 1.13
@@ -1 +1 @@
-cfb9e05c138dff4c430a35eee6229e8a avahi-0.6.10.tar.gz
+91fd8cc0c2bae638848faad36cf1c032 avahi-0.6.11.tar.gz
More information about the fedora-cvs-commits
mailing list