pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 46898 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/avahi via accept of submit request 46898 revision 5.
Request was accepted with message:
Thanks

OBS-URL: https://build.opensuse.org/request/show/46898
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2010-09-01 19:07:20 +00:00 committed by Git OBS Bridge
parent 056ba87bfa
commit 4abda19787
11 changed files with 233 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
avahi-0.6.25-fixcrash.patch
View File

@ -1,30 +0,0 @@
From ae19b3039335999e3c06f2bec9ae11ee79b204c1 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 19 May 2010 15:43:44 +0200
Subject: [PATCH] ignore packet if FIONREAD returns zero
zero size is reported for corrupt packets. recvmsg() later could
nevertheless get data from a good packet that followed the bad one.
So get out early to avoid hitting an assertion.
---
avahi-core/socket.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 4146d5a..8b9736a 100644
--- a/avahi-core/socket.c
+++ b/avahi-core/socket.c
@@ -805,6 +805,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6(
goto fail;
}
+ /* corrupt packets have zero size */
+ if (!ms)
+ goto fail;
+
p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE);
io.iov_base = AVAHI_DNS_PACKET_DATA(p);
--
1.6.4.2

3
avahi-0.6.25.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ba6c9d89f7d471a3a27523efa4c4d1294682b0529c8bbbafbbb04399e40bb55b
size 837834

3
avahi-0.6.27.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:86e159d1edafcd7dbd16f8638a5bab592165fc08fc4603f3e9b30ce479886a63
size 905690

12
avahi-fix-howl.pc.patch Normal file
View File

@ -0,0 +1,12 @@
Index: avahi-0.6.27/Makefile.am
===================================================================
--- avahi-0.6.27.orig/Makefile.am
+++ avahi-0.6.27/Makefile.am
@@ -155,6 +155,7 @@ pkgconfigdir = $(libdir)/pkgconfig
%.pc: %.pc.in
$(AM_V_GEN)sed -e 's,@prefix\@,$(prefix),g' \
-e 's,@libdir\@,$(libdir),g' \
+ -e 's,@HOWL_COMPAT_VERSION\@,$(HOWL_COMPAT_VERSION),g' \
-e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' $< > $@
pkgconfig_DATA = avahi-core.pc

32
avahi-gacdir.patch
View File

@ -14,16 +14,16 @@ Index: avahi-sharp/Makefile.am
=================================================================== ===================================================================
--- avahi-sharp/Makefile.am.orig --- avahi-sharp/Makefile.am.orig
+++ avahi-sharp/Makefile.am +++ avahi-sharp/Makefile.am
@@ -75,10 +75,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah @@ -73,10 +73,10 @@ monodoc_DATA = avahi-sharp-docs.zip avah
endif endif
install-data-hook: $(ASSEMBLY) install-data-hook: $(ASSEMBLY)
- $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) - $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+ $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib + $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
uninstall-hook: $(ASSEMBLY) uninstall-hook: $(ASSEMBLY)
- $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) - $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+ $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib + $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
endif endif
endif endif
@ -31,24 +31,24 @@ Index: avahi-sharp/Makefile.in
=================================================================== ===================================================================
--- avahi-sharp/Makefile.in.orig --- avahi-sharp/Makefile.in.orig
+++ avahi-sharp/Makefile.in +++ avahi-sharp/Makefile.in
@@ -669,10 +669,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i @@ -611,10 +611,10 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.i
@HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en @HAVE_DBUS_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)$(MDASSEMBLER) --out avahi-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY) @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) -@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib +@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY) @HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) -@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib +@HAVE_DBUS_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: avahi-ui-sharp/Makefile.am Index: avahi-ui-sharp/Makefile.am
=================================================================== ===================================================================
--- avahi-ui-sharp/Makefile.am.orig --- avahi-ui-sharp/Makefile.am.orig
+++ avahi-ui-sharp/Makefile.am +++ avahi-ui-sharp/Makefile.am
@@ -62,10 +62,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a @@ -60,10 +60,10 @@ monodoc_DATA = avahi-ui-sharp-docs.zip a
endif endif
install-data-hook: $(ASSEMBLY) install-data-hook: $(ASSEMBLY)
@ -65,8 +65,8 @@ Index: avahi-ui-sharp/Makefile.in
=================================================================== ===================================================================
--- avahi-ui-sharp/Makefile.in.orig --- avahi-ui-sharp/Makefile.in.orig
+++ avahi-ui-sharp/Makefile.in +++ avahi-ui-sharp/Makefile.in
@@ -658,10 +658,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY) @@ -600,10 +600,10 @@ bssh.exe: $(srcdir)/bssh.cs $(ASSEMBLY)
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONODOC_TRUE@@HAVE_MONO_TRUE@ $(AM_V_GEN)$(MDASSEMBLER) --out avahi-ui-sharp-docs --ecma $(srcdir)/en
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY) @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@install-data-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) -@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /i $(ASSEMBLY) /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
@ -75,6 +75,6 @@ Index: avahi-ui-sharp/Makefile.in
@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY) @HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@uninstall-hook: $(ASSEMBLY)
-@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) -@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir)
+@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib +@HAVE_DBUS_TRUE@@HAVE_GTK_TRUE@@HAVE_MONO_TRUE@ $(GACUTIL) /u avahi-ui-sharp /package avahi-ui-sharp /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

63
avahi-glib2.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package avahi-glib2 (Version 0.6.25) # spec file for package avahi-glib2 (Version 0.6.27)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -30,15 +30,15 @@ Name: avahi-glib2
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.25 Version: 0.6.27
Release: 9 Release: 1
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif %endif
%define avahi_client_soname 3 %define avahi_client_soname 3
%define avahi_common_soname 3 %define avahi_common_soname 3
%define avahi_core_soname 6 %define avahi_core_soname 7
%define avahi_ui_soname 0 %define avahi_ui_soname 0
%define avahi_glib_soname 1 %define avahi_glib_soname 1
%define avahi_gobject_soname 0 %define avahi_gobject_soname 0
@ -68,12 +68,12 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch Patch3: avahi-empty-share-dir.patch
#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer # PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
Patch4: avahi-0.6.25-fixcrash.patch Patch4: avahi-gobject-introspection-1.1.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch Patch10: avahi-unicastdomains.patch
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service types database: # Even if we are not building python bindings, we need python to build service types database:
@ -86,8 +86,6 @@ Source5: %{_name}_spec-prepare.sh
PreReq: pwdutils PreReq: pwdutils
Requires: %{_name}-lang = %{version} Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -102,7 +100,7 @@ Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5 Obsoletes: mDNSResponder < 107.5
%endif %endif
%if %build_glib2 %if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_qt3 %if %build_qt3
@ -114,7 +112,7 @@ BuildRequires: libqt4-devel
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_mono %if %build_mono
BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel monodoc-core BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once: # Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif %endif
@ -170,12 +168,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-core6 %package -n libavahi-core7
License: LGPLv2.1+ License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-core6 %description -n libavahi-core7
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -228,14 +226,14 @@ correct mDNS reflection accross LAN segments.
%package -n libhowl0 %package -n libhowl0
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
%description -n libhowl0 %description -n libhowl0
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -296,7 +294,7 @@ across LAN segments.
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
# #
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version} Provides: avahi-devel = %{version}
@ -340,12 +338,12 @@ correct mDNS reflection accross LAN segments.
%package compat-howl-devel %package compat-howl-devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version} Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description compat-howl-devel %description compat-howl-devel
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -647,8 +645,8 @@ translation-update-upstream
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -673,6 +671,7 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\ --libexecdir=%{_prefix}/lib\
--disable-static\ --disable-static\
--with-distro=suse\ --with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core %if %build_core
--enable-compat-libdns_sd\ --enable-compat-libdns_sd\
--enable-compat-howl\ --enable-compat-howl\
@ -684,6 +683,7 @@ intltoolize -f
--enable-glib\ --enable-glib\
--enable-gobject\ --enable-gobject\
--enable-gtk\ --enable-gtk\
--disable-gtk3\
--enable-pygtk\ --enable-pygtk\
%else %else
--disable-glib\ --disable-glib\
@ -691,6 +691,7 @@ intltoolize -f
%if ! %build_mono %if ! %build_mono
--disable-gtk\ --disable-gtk\
%endif %endif
--disable-gtk3\
--disable-pygtk\ --disable-pygtk\
%endif %endif
%if %build_qt3 %if %build_qt3
@ -780,7 +781,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
%if ! %build_glib2 %if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif %endif
%find_lang %{name} %find_lang %{name}
%else %else
@ -810,7 +811,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else %else
@ -858,9 +859,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libavahi-common3 -p /sbin/ldconfig %postun -n libavahi-common3 -p /sbin/ldconfig
%post -n libavahi-core6 -p /sbin/ldconfig %post -n libavahi-core7 -p /sbin/ldconfig
%postun -n libavahi-core6 -p /sbin/ldconfig %postun -n libavahi-core7 -p /sbin/ldconfig
%post -n libdns_sd -p /sbin/ldconfig %post -n libdns_sd -p /sbin/ldconfig
@ -949,6 +950,10 @@ fi
%{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon %{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk: # Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces %{_datadir}/avahi/interfaces
@ -964,7 +969,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-common*.so.* %{_libdir}/libavahi-common*.so.*
%files -n libavahi-core6 %files -n libavahi-core7
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-core*.so.* %{_libdir}/libavahi-core*.so.*
@ -984,7 +989,8 @@ fi
%doc %{_mandir}/man1/avahi-bookmarks.1* %doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks %{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks
%{python_sitelib}/avahi %dir %{python_sitelib}/avahi
%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py %{python_sitelib}/avahi/ServiceTypeDatabase.py
%files utils %files utils
@ -995,7 +1001,6 @@ fi
%{_bindir}/avahi-set-host-name %{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd %{_datadir}/avahi/avahi-service.dtd
%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/ %dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db %{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1* %doc %{_mandir}/man1/avahi-browse*.1*
@ -1008,6 +1013,7 @@ fi
# FIXME: Maybe split to particular subpackages. # FIXME: Maybe split to particular subpackages.
#%doc doc/api/html #%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client %{_includedir}/avahi-client
%{_includedir}/avahi-common %{_includedir}/avahi-common
%{_includedir}/avahi-core %{_includedir}/avahi-core
@ -1051,6 +1057,8 @@ fi
%files -n libavahi-gobject0 %files -n libavahi-gobject0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.* %{_libdir}/libavahi-gobject*.so.*
%{_libdir}/girepository-1.0/Avahi-0.6.typelib
%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
%files -n python-avahi-gtk %files -n python-avahi-gtk
%defattr(-,root,root) %defattr(-,root,root)
@ -1087,6 +1095,7 @@ fi
%{_libdir}/libavahi-gobject*.*a %{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so %{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc %{_libdir}/pkgconfig/avahi-gobject.pc
%{_datadir}/gir-1.0/*.gir
%endif %endif
%if %build_qt3 %if %build_qt3

11
avahi-gobject-introspection-1.1.patch Normal file
View File

@ -0,0 +1,11 @@
Index: avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
===================================================================
--- avahi-0.6.27.orig/avahi-gobject/AvahiCore-0.6.gir
+++ avahi-0.6.27/avahi-gobject/AvahiCore-0.6.gir
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<repository version="1.0"
+<repository version="1.1"
xmlns="http://www.gtk.org/introspection/core/1.0"
xmlns:c="http://www.gtk.org/introspection/c/1.0"
xmlns:glib="http://www.gtk.org/introspection/glib/1.0">

63
avahi-mono.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package avahi-mono (Version 0.6.25) # spec file for package avahi-mono (Version 0.6.27)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -30,15 +30,15 @@ Name: avahi-mono
%define build_mono 1 %define build_mono 1
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.25 Version: 0.6.27
Release: 9 Release: 1
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif %endif
%define avahi_client_soname 3 %define avahi_client_soname 3
%define avahi_common_soname 3 %define avahi_common_soname 3
%define avahi_core_soname 6 %define avahi_core_soname 7
%define avahi_ui_soname 0 %define avahi_ui_soname 0
%define avahi_glib_soname 1 %define avahi_glib_soname 1
%define avahi_gobject_soname 0 %define avahi_gobject_soname 0
@ -68,12 +68,12 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch Patch3: avahi-empty-share-dir.patch
#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer # PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
Patch4: avahi-0.6.25-fixcrash.patch Patch4: avahi-gobject-introspection-1.1.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch Patch10: avahi-unicastdomains.patch
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service types database: # Even if we are not building python bindings, we need python to build service types database:
@ -86,8 +86,6 @@ Source5: %{_name}_spec-prepare.sh
PreReq: pwdutils PreReq: pwdutils
Requires: %{_name}-lang = %{version} Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -102,7 +100,7 @@ Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5 Obsoletes: mDNSResponder < 107.5
%endif %endif
%if %build_glib2 %if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_qt3 %if %build_qt3
@ -114,7 +112,7 @@ BuildRequires: libqt4-devel
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_mono %if %build_mono
BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel monodoc-core BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once: # Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif %endif
@ -169,12 +167,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-core6 %package -n libavahi-core7
License: LGPLv2.1+ License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-core6 %description -n libavahi-core7
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -227,14 +225,14 @@ correct mDNS reflection accross LAN segments.
%package -n libhowl0 %package -n libhowl0
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
%description -n libhowl0 %description -n libhowl0
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -295,7 +293,7 @@ across LAN segments.
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
# #
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version} Provides: avahi-devel = %{version}
@ -339,12 +337,12 @@ correct mDNS reflection accross LAN segments.
%package compat-howl-devel %package compat-howl-devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version} Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description compat-howl-devel %description compat-howl-devel
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -646,8 +644,8 @@ translation-update-upstream
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -672,6 +670,7 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\ --libexecdir=%{_prefix}/lib\
--disable-static\ --disable-static\
--with-distro=suse\ --with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core %if %build_core
--enable-compat-libdns_sd\ --enable-compat-libdns_sd\
--enable-compat-howl\ --enable-compat-howl\
@ -683,6 +682,7 @@ intltoolize -f
--enable-glib\ --enable-glib\
--enable-gobject\ --enable-gobject\
--enable-gtk\ --enable-gtk\
--disable-gtk3\
--enable-pygtk\ --enable-pygtk\
%else %else
--disable-glib\ --disable-glib\
@ -690,6 +690,7 @@ intltoolize -f
%if ! %build_mono %if ! %build_mono
--disable-gtk\ --disable-gtk\
%endif %endif
--disable-gtk3\
--disable-pygtk\ --disable-pygtk\
%endif %endif
%if %build_qt3 %if %build_qt3
@ -779,7 +780,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
%if ! %build_glib2 %if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif %endif
%find_lang %{name} %find_lang %{name}
%else %else
@ -809,7 +810,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else %else
@ -857,9 +858,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libavahi-common3 -p /sbin/ldconfig %postun -n libavahi-common3 -p /sbin/ldconfig
%post -n libavahi-core6 -p /sbin/ldconfig %post -n libavahi-core7 -p /sbin/ldconfig
%postun -n libavahi-core6 -p /sbin/ldconfig %postun -n libavahi-core7 -p /sbin/ldconfig
%post -n libdns_sd -p /sbin/ldconfig %post -n libdns_sd -p /sbin/ldconfig
@ -948,6 +949,10 @@ fi
%{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon %{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk: # Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces %{_datadir}/avahi/interfaces
@ -963,7 +968,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-common*.so.* %{_libdir}/libavahi-common*.so.*
%files -n libavahi-core6 %files -n libavahi-core7
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-core*.so.* %{_libdir}/libavahi-core*.so.*
@ -983,7 +988,8 @@ fi
%doc %{_mandir}/man1/avahi-bookmarks.1* %doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks %{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks
%{python_sitelib}/avahi %dir %{python_sitelib}/avahi
%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py %{python_sitelib}/avahi/ServiceTypeDatabase.py
%files utils %files utils
@ -994,7 +1000,6 @@ fi
%{_bindir}/avahi-set-host-name %{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd %{_datadir}/avahi/avahi-service.dtd
%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/ %dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db %{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1* %doc %{_mandir}/man1/avahi-browse*.1*
@ -1007,6 +1012,7 @@ fi
# FIXME: Maybe split to particular subpackages. # FIXME: Maybe split to particular subpackages.
#%doc doc/api/html #%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client %{_includedir}/avahi-client
%{_includedir}/avahi-common %{_includedir}/avahi-common
%{_includedir}/avahi-core %{_includedir}/avahi-core
@ -1050,6 +1056,8 @@ fi
%files -n libavahi-gobject0 %files -n libavahi-gobject0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.* %{_libdir}/libavahi-gobject*.so.*
%{_libdir}/girepository-1.0/Avahi-0.6.typelib
%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
%files -n python-avahi-gtk %files -n python-avahi-gtk
%defattr(-,root,root) %defattr(-,root,root)
@ -1086,6 +1094,7 @@ fi
%{_libdir}/libavahi-gobject*.*a %{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so %{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc %{_libdir}/pkgconfig/avahi-gobject.pc
%{_datadir}/gir-1.0/*.gir
%endif %endif
%if %build_qt3 %if %build_qt3

63
avahi-qt4.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package avahi-qt4 (Version 0.6.25) # spec file for package avahi-qt4 (Version 0.6.27)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -30,15 +30,15 @@ Name: avahi-qt4
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 1 %define build_qt4 1
Version: 0.6.25 Version: 0.6.27
Release: 9 Release: 1
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif %endif
%define avahi_client_soname 3 %define avahi_client_soname 3
%define avahi_common_soname 3 %define avahi_common_soname 3
%define avahi_core_soname 6 %define avahi_core_soname 7
%define avahi_ui_soname 0 %define avahi_ui_soname 0
%define avahi_glib_soname 1 %define avahi_glib_soname 1
%define avahi_gobject_soname 0 %define avahi_gobject_soname 0
@ -68,12 +68,12 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch Patch3: avahi-empty-share-dir.patch
#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer # PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
Patch4: avahi-0.6.25-fixcrash.patch Patch4: avahi-gobject-introspection-1.1.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch Patch10: avahi-unicastdomains.patch
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service types database: # Even if we are not building python bindings, we need python to build service types database:
@ -86,8 +86,6 @@ Source5: %{_name}_spec-prepare.sh
PreReq: pwdutils PreReq: pwdutils
Requires: %{_name}-lang = %{version} Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -102,7 +100,7 @@ Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5 Obsoletes: mDNSResponder < 107.5
%endif %endif
%if %build_glib2 %if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_qt3 %if %build_qt3
@ -114,7 +112,7 @@ BuildRequires: libqt4-devel
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_mono %if %build_mono
BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel monodoc-core BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once: # Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif %endif
@ -172,12 +170,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-core6 %package -n libavahi-core7
License: LGPLv2.1+ License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-core6 %description -n libavahi-core7
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -230,14 +228,14 @@ correct mDNS reflection accross LAN segments.
%package -n libhowl0 %package -n libhowl0
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
%description -n libhowl0 %description -n libhowl0
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -298,7 +296,7 @@ across LAN segments.
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
# #
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version} Provides: avahi-devel = %{version}
@ -342,12 +340,12 @@ correct mDNS reflection accross LAN segments.
%package compat-howl-devel %package compat-howl-devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version} Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description compat-howl-devel %description compat-howl-devel
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -649,8 +647,8 @@ translation-update-upstream
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -675,6 +673,7 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\ --libexecdir=%{_prefix}/lib\
--disable-static\ --disable-static\
--with-distro=suse\ --with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core %if %build_core
--enable-compat-libdns_sd\ --enable-compat-libdns_sd\
--enable-compat-howl\ --enable-compat-howl\
@ -686,6 +685,7 @@ intltoolize -f
--enable-glib\ --enable-glib\
--enable-gobject\ --enable-gobject\
--enable-gtk\ --enable-gtk\
--disable-gtk3\
--enable-pygtk\ --enable-pygtk\
%else %else
--disable-glib\ --disable-glib\
@ -693,6 +693,7 @@ intltoolize -f
%if ! %build_mono %if ! %build_mono
--disable-gtk\ --disable-gtk\
%endif %endif
--disable-gtk3\
--disable-pygtk\ --disable-pygtk\
%endif %endif
%if %build_qt3 %if %build_qt3
@ -782,7 +783,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
%if ! %build_glib2 %if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif %endif
%find_lang %{name} %find_lang %{name}
%else %else
@ -812,7 +813,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else %else
@ -860,9 +861,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libavahi-common3 -p /sbin/ldconfig %postun -n libavahi-common3 -p /sbin/ldconfig
%post -n libavahi-core6 -p /sbin/ldconfig %post -n libavahi-core7 -p /sbin/ldconfig
%postun -n libavahi-core6 -p /sbin/ldconfig %postun -n libavahi-core7 -p /sbin/ldconfig
%post -n libdns_sd -p /sbin/ldconfig %post -n libdns_sd -p /sbin/ldconfig
@ -951,6 +952,10 @@ fi
%{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon %{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk: # Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces %{_datadir}/avahi/interfaces
@ -966,7 +971,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-common*.so.* %{_libdir}/libavahi-common*.so.*
%files -n libavahi-core6 %files -n libavahi-core7
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-core*.so.* %{_libdir}/libavahi-core*.so.*
@ -986,7 +991,8 @@ fi
%doc %{_mandir}/man1/avahi-bookmarks.1* %doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks %{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks
%{python_sitelib}/avahi %dir %{python_sitelib}/avahi
%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py %{python_sitelib}/avahi/ServiceTypeDatabase.py
%files utils %files utils
@ -997,7 +1003,6 @@ fi
%{_bindir}/avahi-set-host-name %{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd %{_datadir}/avahi/avahi-service.dtd
%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/ %dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db %{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1* %doc %{_mandir}/man1/avahi-browse*.1*
@ -1010,6 +1015,7 @@ fi
# FIXME: Maybe split to particular subpackages. # FIXME: Maybe split to particular subpackages.
#%doc doc/api/html #%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client %{_includedir}/avahi-client
%{_includedir}/avahi-common %{_includedir}/avahi-common
%{_includedir}/avahi-core %{_includedir}/avahi-core
@ -1053,6 +1059,8 @@ fi
%files -n libavahi-gobject0 %files -n libavahi-gobject0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.* %{_libdir}/libavahi-gobject*.so.*
%{_libdir}/girepository-1.0/Avahi-0.6.typelib
%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
%files -n python-avahi-gtk %files -n python-avahi-gtk
%defattr(-,root,root) %defattr(-,root,root)
@ -1089,6 +1097,7 @@ fi
%{_libdir}/libavahi-gobject*.*a %{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so %{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc %{_libdir}/pkgconfig/avahi-gobject.pc
%{_datadir}/gir-1.0/*.gir
%endif %endif
%if %build_qt3 %if %build_qt3

47
avahi.changes
View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Wed Sep 1 13:23:37 CEST 2010 - vuntz@opensuse.org
- Update to version 0.6.27:
+ Various systemd fixes.
+ Daemon:
- make sure we never choke on SIGPIPE
- return successful error code when we ran successfully
- reset signals on initialization
- unblock all signals by default
+ Update libavahi-client so that it can deal with auto-activated
avahi daemons
+ Bump soname
+ Build fix when gtk3 is not installed.
+ i18n updates
- Changes from version 0.6.26:
+ Fix CVE-2010-2244
+ Support for Gtk+ 3 and Gtk+ Introspection
+ Native systemd socket activation support
+ Add systemd service files
+ Add various resource control options, for traffic rate limiting
as well as cache size and D-Bus client object limits.
+ i18n updates
+ Minor other updates
- Rename libavahi-core6 to libavahi-core7, to follow library soname
bump.
- Rebase avahi-gacdir.patch.
- Add avahi-gobject-introspection-1.1.patch to set format of gir
file to 1.1.
- Add avahi-fix-howl.pc.patch to fix generation of howl.pc.
- Drop avahi-0.6.25-fixcrash.patch: fixed upstream.
- Drop avahi-init_unused-not-dead.patch: fixed upstream.
- Add gobject-introspection-devel BuildRequires for the glib2
build, to get introspection support.
- Remove libglade2-devel BuildRequires.
- Remove avahi-utils-gtk <= 0.6.22 Conflicts, since the file for
which we added the Conflicts doesn't exist anymore.
- Pass --disable-gtk3 to configure since we don't want gtk3 support
right now.
- Pass --with-systemdsystemunitdir=/lib/systemd/system to
configure. Thanks Kay!
-------------------------------------------------------------------
Mon Jun 21 12:04:15 UTC 2010 - lnussel@suse.de
- also check ipv6 case in avahi-0.6.25-fixcrash.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de

63
avahi.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package avahi (Version 0.6.25) # spec file for package avahi (Version 0.6.27)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -32,15 +32,15 @@ Name: avahi
%define build_mono 0 %define build_mono 0
%define build_qt3 0 %define build_qt3 0
%define build_qt4 0 %define build_qt4 0
Version: 0.6.25 Version: 0.6.27
Release: 9 Release: 1
%if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4 %if !%build_glib2 && !%build_mono && !%build_qt3 && !%build_qt4
# Create split spec files only when building per partes: # Create split spec files only when building per partes:
#%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name}) #%(sh %{_sourcedir}/%{_name}_spec-prepare.sh %{_sourcedir} %{name})
%endif %endif
%define avahi_client_soname 3 %define avahi_client_soname 3
%define avahi_common_soname 3 %define avahi_common_soname 3
%define avahi_core_soname 6 %define avahi_core_soname 7
%define avahi_ui_soname 0 %define avahi_ui_soname 0
%define avahi_glib_soname 1 %define avahi_glib_soname 1
%define avahi_gobject_soname 0 %define avahi_gobject_soname 0
@ -70,12 +70,12 @@ Patch1: avahi-desktop.patch
Patch2: avahi-init-lsb.patch Patch2: avahi-init-lsb.patch
#PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer #PATCH-FIX-UPSTREAM avahi-empty-share-dir.patch jpr@novell.com -- mailed maintainer
Patch3: avahi-empty-share-dir.patch Patch3: avahi-empty-share-dir.patch
#PATCH-FIX-UPSTREAM avahi-0.6.25-fixcrash.patch lnussel@suse.de -- mailed maintainer # PATCH-FIX-UPSTREAM avahi-gobject-introspection-1.1.patch vuntz@opensuse.org -- New version of introspection format; http://www.avahi.org/ticket/318
Patch4: avahi-0.6.25-fixcrash.patch Patch4: avahi-gobject-introspection-1.1.patch
# PATCH-FIX-UPSTREAM avahi-fix-howl.pc.patch vuntz@opensuse.org -- Fix howl.pc to be correctly generated, mailed upstream
Patch5: avahi-fix-howl.pc.patch
#PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default #PATCH-FIX-OPENSUSE avahi-unicastdomains.patch bnc433359 lnussel@suse.de -- disable pre-set unicast domains by default
Patch10: avahi-unicastdomains.patch Patch10: avahi-unicastdomains.patch
# PATCH-FIX-UPSTREAM avahi-init_unused-not-dead.patch bnc#329708 dimstar@opensuse.org -- Report unused instead of dead
Patch11: avahi-init_unused-not-dead.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream BuildRequires: dbus-1-python fdupes gcc-c++ gdbm-devel intltool libdaemon-devel libexpat-devel pkg-config translation-update-upstream
# Even if we are not building python bindings, we need python to build service types database: # Even if we are not building python bindings, we need python to build service types database:
@ -88,8 +88,6 @@ Source5: %{_name}_spec-prepare.sh
PreReq: pwdutils PreReq: pwdutils
Requires: %{_name}-lang = %{version} Requires: %{_name}-lang = %{version}
BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel BuildRequires: dbus-1-devel doxygen graphviz python-gdbm zlib-devel
# For update of avahi-discover.glade from == 11.0:
Conflicts: avahi-utils-gtk <= 0.6.22
# For python bindings and utilities: # For python bindings and utilities:
#BuildRequires: dbus-1-python #BuildRequires: dbus-1-python
#Requires: dbus-1 #Requires: dbus-1
@ -104,7 +102,7 @@ Provides: mDNSResponder = 107.5
Obsoletes: mDNSResponder < 107.5 Obsoletes: mDNSResponder < 107.5
%endif %endif
%if %build_glib2 %if %build_glib2
BuildRequires: libglade2-devel python-gtk-devel update-desktop-files BuildRequires: gobject-introspection-devel python-gtk-devel update-desktop-files
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_qt3 %if %build_qt3
@ -116,7 +114,7 @@ BuildRequires: libqt4-devel
BuildRequires: libavahi-devel BuildRequires: libavahi-devel
%endif %endif
%if %build_mono %if %build_mono
BuildRequires: gtk-sharp2 libavahi-glib-devel libglade2-devel mono-devel monodoc-core BuildRequires: gtk-sharp2 libavahi-glib-devel mono-devel monodoc-core
# Please copy this line to avahi-mono definition below for build all-in-once: # Please copy this line to avahi-mono definition below for build all-in-once:
Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version} Requires: gtk-sharp2 libavahi-client3 >= %{version} libavahi-common3 >= %{version} libavahi-ui0 >= %{version} libavahi-glib1 >= %{version}
%endif %endif
@ -172,12 +170,12 @@ It passes all tests in the Apple Bonjour conformance test suite. In
addition, it supports some nifty things, like correct mDNS reflection addition, it supports some nifty things, like correct mDNS reflection
across LAN segments. across LAN segments.
%package -n libavahi-core6 %package -n libavahi-core7
License: LGPLv2.1+ License: LGPLv2.1+
Summary: D-BUS Service for Zeroconf and Bonjour Summary: D-BUS Service for Zeroconf and Bonjour
Group: System/Libraries Group: System/Libraries
%description -n libavahi-core6 %description -n libavahi-core7
Avahi is an implementation of the DNS Service Discovery and Multicast Avahi is an implementation of the DNS Service Discovery and Multicast
DNS specifications for Zeroconf Computing. It uses D-BUS for DNS specifications for Zeroconf Computing. It uses D-BUS for
communication between user applications and a system daemon. The daemon communication between user applications and a system daemon. The daemon
@ -230,14 +228,14 @@ correct mDNS reflection accross LAN segments.
%package -n libhowl0 %package -n libhowl0
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Group: System/Libraries Group: System/Libraries
# Old name used for <= 10.3: # Old name used for <= 10.3:
Provides: avahi-compat-howl = %{version} Provides: avahi-compat-howl = %{version}
Obsoletes: avahi-compat-howl < %{version} Obsoletes: avahi-compat-howl < %{version}
%description -n libhowl0 %description -n libhowl0
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -298,7 +296,7 @@ across LAN segments.
License: LGPLv2.1+ License: LGPLv2.1+
Summary: Include Files and Libraries Mandatory for Development Summary: Include Files and Libraries Mandatory for Development
# #
Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core6 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel Requires: %{_name} = %{version} libavahi-common3 = %{version} libavahi-core7 = %{version} libavahi-client3 = %{version} dbus-1-devel glibc-devel
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
# Last appeared in OpenSUSE 10.3: # Last appeared in OpenSUSE 10.3:
Provides: avahi-devel = %{version} Provides: avahi-devel = %{version}
@ -342,12 +340,12 @@ correct mDNS reflection accross LAN segments.
%package compat-howl-devel %package compat-howl-devel
License: LGPLv2.1+ License: LGPLv2.1+
Summary: howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour Summary: Howl Compatibility Package for D-BUS Service for Zeroconf/Bonjour
Requires: libavahi-devel = %{version} libhowl0 = %{version} Requires: libavahi-devel = %{version} libhowl0 = %{version}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
%description compat-howl-devel %description compat-howl-devel
howl compatibility layer for avahi. Howl compatibility layer for avahi.
Avahi is an Implementation the DNS Service Discovery and Multicast DNS Avahi is an Implementation the DNS Service Discovery and Multicast DNS
specifications for Zeroconf Computing. It uses D-BUS for communication specifications for Zeroconf Computing. It uses D-BUS for communication
@ -649,8 +647,8 @@ translation-update-upstream
%patch2 %patch2
%patch3 %patch3
%patch4 -p1 %patch4 -p1
%patch5 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1
%if !%build_core %if !%build_core
# Replace all .la references from local .la files to installed versions # Replace all .la references from local .la files to installed versions
# with exception of libavahi-glib.la. # with exception of libavahi-glib.la.
@ -675,6 +673,7 @@ intltoolize -f
--libexecdir=%{_prefix}/lib\ --libexecdir=%{_prefix}/lib\
--disable-static\ --disable-static\
--with-distro=suse\ --with-distro=suse\
--with-systemdsystemunitdir=/lib/systemd/system\
%if %build_core %if %build_core
--enable-compat-libdns_sd\ --enable-compat-libdns_sd\
--enable-compat-howl\ --enable-compat-howl\
@ -686,6 +685,7 @@ intltoolize -f
--enable-glib\ --enable-glib\
--enable-gobject\ --enable-gobject\
--enable-gtk\ --enable-gtk\
--disable-gtk3\
--enable-pygtk\ --enable-pygtk\
%else %else
--disable-glib\ --disable-glib\
@ -693,6 +693,7 @@ intltoolize -f
%if ! %build_mono %if ! %build_mono
--disable-gtk\ --disable-gtk\
%endif %endif
--disable-gtk3\
--disable-pygtk\ --disable-pygtk\
%endif %endif
%if %build_qt3 %if %build_qt3
@ -782,7 +783,7 @@ install -m 644 %{S:1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-nettool2.png
%if ! %build_glib2 %if ! %build_glib2
# Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file is intentionally installed here. It is needed for avahi-utils-gtk and python-avahi-gtk:
install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -d $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
install -m 644 avahi-discover-standalone/avahi-discover.glade $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces install -m 644 avahi-discover-standalone/avahi-discover.ui $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
%endif %endif
%find_lang %{name} %find_lang %{name}
%else %else
@ -812,7 +813,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-daemon.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.8*
rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8* rm $RPM_BUILD_ROOT%{_mandir}/man8/avahi-dnsconfd.action.8*
# Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk: # Note: This file was intentionally moved to avahi. It is needed for avahi-utils-gtk and python-avahi-gtk:
rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.glade rm $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces/avahi-discover.ui
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces rmdir $RPM_BUILD_ROOT%{_datadir}/avahi/interfaces
rmdir $RPM_BUILD_ROOT%{_datadir}/avahi rmdir $RPM_BUILD_ROOT%{_datadir}/avahi
%else %else
@ -860,9 +861,9 @@ rm -rf $RPM_BUILD_ROOT
%postun -n libavahi-common3 -p /sbin/ldconfig %postun -n libavahi-common3 -p /sbin/ldconfig
%post -n libavahi-core6 -p /sbin/ldconfig %post -n libavahi-core7 -p /sbin/ldconfig
%postun -n libavahi-core6 -p /sbin/ldconfig %postun -n libavahi-core7 -p /sbin/ldconfig
%post -n libdns_sd -p /sbin/ldconfig %post -n libdns_sd -p /sbin/ldconfig
@ -951,6 +952,10 @@ fi
%{_sysconfdir}/dbus-1/system.d/*.conf %{_sysconfdir}/dbus-1/system.d/*.conf
%{_sysconfdir}/init.d/avahi-dnsconfd %{_sysconfdir}/init.d/avahi-dnsconfd
%{_sysconfdir}/init.d/avahi-daemon %{_sysconfdir}/init.d/avahi-daemon
%{_datadir}/dbus-1/system-services/org.freedesktop.Avahi.service
/lib/systemd/system/avahi-daemon.service
/lib/systemd/system/avahi-daemon.socket
/lib/systemd/system/avahi-dnsconfd.service
# Common file for avahi-utils-gtk and python-avahi-gtk: # Common file for avahi-utils-gtk and python-avahi-gtk:
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/interfaces %{_datadir}/avahi/interfaces
@ -966,7 +971,7 @@ fi
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-common*.so.* %{_libdir}/libavahi-common*.so.*
%files -n libavahi-core6 %files -n libavahi-core7
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-core*.so.* %{_libdir}/libavahi-core*.so.*
@ -986,7 +991,8 @@ fi
%doc %{_mandir}/man1/avahi-bookmarks.1* %doc %{_mandir}/man1/avahi-bookmarks.1*
%{_sbindir}/rcavahi-bookmarks %{_sbindir}/rcavahi-bookmarks
%{_sysconfdir}/init.d/avahi-bookmarks %{_sysconfdir}/init.d/avahi-bookmarks
%{python_sitelib}/avahi %dir %{python_sitelib}/avahi
%{python_sitelib}/avahi/__init__.py*
%{python_sitelib}/avahi/ServiceTypeDatabase.py %{python_sitelib}/avahi/ServiceTypeDatabase.py
%files utils %files utils
@ -997,7 +1003,6 @@ fi
%{_bindir}/avahi-set-host-name %{_bindir}/avahi-set-host-name
%dir %{_datadir}/avahi/ %dir %{_datadir}/avahi/
%{_datadir}/avahi/avahi-service.dtd %{_datadir}/avahi/avahi-service.dtd
%{_datadir}/avahi/introspection
%dir %{_libdir}/avahi/ %dir %{_libdir}/avahi/
%{_libdir}/avahi/service-types.db %{_libdir}/avahi/service-types.db
%doc %{_mandir}/man1/avahi-browse*.1* %doc %{_mandir}/man1/avahi-browse*.1*
@ -1010,6 +1015,7 @@ fi
# FIXME: Maybe split to particular subpackages. # FIXME: Maybe split to particular subpackages.
#%doc doc/api/html #%doc doc/api/html
#%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO #%doc doc/*.html doc/*.txt doc/file-boilerplate.c doc/TODO
%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
%{_includedir}/avahi-client %{_includedir}/avahi-client
%{_includedir}/avahi-common %{_includedir}/avahi-common
%{_includedir}/avahi-core %{_includedir}/avahi-core
@ -1053,6 +1059,8 @@ fi
%files -n libavahi-gobject0 %files -n libavahi-gobject0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libavahi-gobject*.so.* %{_libdir}/libavahi-gobject*.so.*
%{_libdir}/girepository-1.0/Avahi-0.6.typelib
%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
%files -n python-avahi-gtk %files -n python-avahi-gtk
%defattr(-,root,root) %defattr(-,root,root)
@ -1089,6 +1097,7 @@ fi
%{_libdir}/libavahi-gobject*.*a %{_libdir}/libavahi-gobject*.*a
%{_libdir}/libavahi-gobject*.so %{_libdir}/libavahi-gobject*.so
%{_libdir}/pkgconfig/avahi-gobject.pc %{_libdir}/pkgconfig/avahi-gobject.pc
%{_datadir}/gir-1.0/*.gir
%endif %endif
%if %build_qt3 %if %build_qt3