X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avahi.spec;h=fc00facb14f0f1c873a432469bacfeb491472fee;hb=c42a51ef35877c2439a80ebf60dc0b487598a414;hp=1e193d106219203a886cbdd9909f1856ae1078ed;hpb=2cb8cc9ace9856b05fd8219ea54351d3df63cc8d;p=packages%2Favahi.git

diff --git a/avahi.spec b/avahi.spec
index 1e193d1..fc00fac 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,54 +1,102 @@
 #
-# Conditional build:
-%bcond_without	dotnet		# build with dotnet bindings
-%bcond_without	qt		# build with qt bindings
-#
-%include /usr/lib/rpm/macros.mono
+# TODO:
+#	- finish with_apidocs
+#	- introspection files
+#       - dbus files
 #
-Summary:	Free mDNS/DNS-SD implementation
-Summary(pl):	Wolna implementacja mDNS/DNS-SD
+# Conditional build:
+%bcond_with	apidocs		# build API documentation
+%bcond_without	dotnet		# build without dotnet bindings
+%bcond_without	gtk		# build without GTK+
+%bcond_without	gtk3		# build without GTK+3
+%bcond_without	pygtk		# build without PyGTK
+%bcond_without	qt		# build without (any) qt bindings
+%bcond_without	qt3		# build without qt3 bindings
+%bcond_without	qt4		# build without qt4 bindings
+
+%ifnarch %{ix86} %{x8664} alpha arm hppa ia64 mips ppc s390 s390x sparc sparcv9
+%undefine with_dotnet
+%endif
+%ifarch i386
+%undefine with_dotnet
+%endif
+
+%if %{without qt}
+%undefine	with_qt3
+%undefine	with_qt4
+%endif
+
+%{?with_dotnet:%include /usr/lib/rpm/macros.mono}
+Summary:	Free mDNS/DNS-SD/Zeroconf implementation
+Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD/Zeroconf
 Name:		avahi
-Version:	0.6.9
-Release:	4
-License:	GPL v.2/LGPL
+Version:	0.6.28
+Release:	7
+License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	2652910f0e52c373d7a15b6851750517
+# Source0-md5:	d0143a5aa3265019072e53ab497818d0
 Source1:	%{name}-daemon
 Source2:	%{name}-dnsconfd
 Source3:	%{name}.png
+Source4:	%{name}-daemon.upstart
+Source5:	%{name}-dnsconfd.upstart
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-glade.patch
 Patch2:		%{name}-destdir.patch
+Patch3:		%{name}-mono-dir.patch
+Patch4:		nss-mdns-package.patch
+Patch5:		%{name}-dhclient_hooks.patch
+Patch6:		%{name}-autoipd-sbin_ip.patch
 URL:		http://avahi.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	dbus-devel >= 0.34
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	dbus-devel >= 0.92
+%if %{with apidocs}
 BuildRequires:	doxygen
+# for the 'dot' tool used by doxygen
+BuildRequires:	graphviz
+%endif
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
-BuildRequires:	glib2-devel >= 1:2.4.0
-BuildRequires:	graphviz
-BuildRequires:	gtk+2-devel >= 2:2.4.0
-BuildRequires:	libdaemon-devel >= 0.5
-BuildRequires:	libglade2-devel >= 1:2.5.1-5
+BuildRequires:	gettext-devel
+BuildRequires:	gobject-introspection-devel >= 0.9.5
+%if %{with gtk}
+BuildRequires:	glib2-devel >= 1:2.12.2
+BuildRequires:	gtk+2-devel >= 2:2.14.0
+%endif
+%if %{with gtk3}
+BuildRequires:	glib2-devel >= 1:2.28.0
+BuildRequires:	gtk+3-devel >= 3.0.0
+%endif
+BuildRequires:	intltool >= 0.35
+BuildRequires:	libcap-devel
+BuildRequires:	libdaemon-devel >= 0.14
 BuildRequires:	libtool
 %if %{with dotnet}
+BuildRequires:	dotnet-gtk-sharp2-devel >= 2.10
 BuildRequires:	mono-csharp
-BuildRequires:	monodoc
+BuildRequires:	monodoc >= 2.6
 %endif
 BuildRequires:	pkgconfig
-BuildRequires:	python-dbus
-BuildRequires:	python-pygtk-devel
-%if %{with qt}
-BuildRequires:	QtCore-devel
-BuildRequires:	qt-devel >= 3.0
+BuildRequires:	python >= 1:2.4
+BuildRequires:	python-dbus >= 0.71
+%{?with_pygtk:BuildRequires:	python-pygtk-devel >= 2:2.9.6}
+%if %{with qt3}
+BuildRequires:	qt-devel >= 1:3.0
+%endif
+%if %{with qt4}
+BuildRequires:	QtCore-devel >= 4.0.0
 BuildRequires:	qt4-build
 %endif
-BuildRequires:	rpmbuild(macros) >= 1.228
+BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.561
 Requires(post,preun):	/sbin/chkconfig
-Requires:	dbus >= 0.60-2
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dbus >= 0.92
+Requires:	libdaemon >= 0.14
+Requires:	rc-scripts >= 0.4.3
+Suggests:	nss_mdns >= 0.10-2
 Provides:	group(avahi)
 Provides:	user(avahi)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -58,51 +106,184 @@ Avahi is an implementation the DNS Service Discovery and Multicast DNS
 specifications for Zeroconf Computing. It uses D-BUS for communication
 between user applications and a system daemon.
 
-%description -l pl
-Avahi jest implementacj± specyfikacji DNS Service Discovery i
-Multicast DNS dla Zeroconf Computing. U¿ywa D-BUSa dla komunikacji
-pomiêdzy programami u¿ytkownika a demonem systemowym.
+%description -l pl.UTF-8
+Avahi jest implementacją specyfikacji DNS Service Discovery i
+Multicast DNS dla Zeroconf Computing. Używa D-BUSa dla komunikacji
+pomiędzy programami użytkownika a demonem systemowym.
+
+%package upstart
+Summary:	Upstart jobs description for Avahi daemons
+Summary(pl.UTF-8):	Opis zadań Upstart dla demonów Avahi
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires:	upstart >= 0.6
+
+%description upstart
+Upstart jobs description for Avahi daemons.
+
+%description upstart -l pl.UTF-8
+Opis zadań Upstart dla demonów Avahi.
+
+%package autoipd
+Summary:	IPv4LL network address configuration daemon
+Summary(pl.UTF-8):	Demon configurujący adresy IPv4LL
+Group:		Networking/Daemons
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Provides:	group(avahi)
+Provides:	user(avahi)
+
+%description autoipd
+avahi-autoipd implements IPv4LL, "Dynamic Configuration of IPv4 Link-
+Local Addresses" (IETF RFC3927), a protocol for automatic IP address
+configuration from the link-local 169.254.0.0/16 range without the
+need for a central server. It is primarily intended to be used in
+ad-hoc networks which lack a DHCP server.
+
+IPv4LL is part of the Zeroconf stack.
+
+%description autoipd -l pl.UTF-8
+avahi-autoipd jest implementacją IPv4LL, protokołu umożliwiającego
+automatyczną konfigurację adresu z zakresu 169.254.0.0/16 bez potrzeby
+użycia centralnego serwera. Jego głównym zastosowaniem są sieci
+ad-hoc, w których brakuje serwera DHCP.
+
+IPv4LL jest częścią stosu Zeroconf.
 
 %package libs
 Summary:	Avahi client, common and core libraries
-Summary(pl):	Biblioteki Avahi: klienta, wspólna i g³ówna
+Summary(pl.UTF-8):	Biblioteki Avahi: klienta, wspólna i główna
 Group:		Libraries
 
 %description libs
 Avahi client, common and core libraries.
 
-%description libs -l pl
-Biblioteki Avahi: klienta, wspólna i g³ówna.
+%description libs -l pl.UTF-8
+Biblioteki Avahi: klienta, wspólna i główna.
 
 %package devel
 Summary:	Header files for Avahi library
-Summary(pl):	Pliki nag³ówkowe biblioteki Avahi
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Avahi
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dbus-devel >= 0.92
 Requires:	expat-devel
-Requires:	libdaemon-devel >= 0.5
 
 %description devel
 This is the package containing the header files for Avahi library.
 
-%description devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe biblioteki Avahi.
+%description devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe biblioteki Avahi.
 
 %package static
 Summary:	Static Avahi library
-Summary(pl):	Statyczna biblioteka Avahi
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static Avahi library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka Avahi.
 
+%package ui
+Summary:	Avahi UI library
+Summary(pl.UTF-8):	Biblioteka Avahi UI
+Group:		X11/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk+2 >= 2:2.14.0
+
+%description ui
+Common GTK+ UI support library for Avahi.
+
+%description ui -l pl.UTF-8
+Biblioteka wspólnego interfejsu użytkownika GTK+ dla Avahi.
+
+%package ui-devel
+Summary:	Header files for Avahi UI library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Avahi UI
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-ui = %{version}-%{release}
+Requires:	%{name}-ui-devel-common = %{version}-%{release}
+Requires:	gtk+2-devel >= 2:2.14.0
+
+%description ui-devel
+Header files for Avahi UI library.
+
+%description ui-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Avahi UI.
+
+%package ui-static
+Summary:	Static Avahi UI library
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi UI
+Group:		X11/Development/Libraries
+Requires:	%{name}-ui-devel = %{version}-%{release}
+
+%description ui-static
+Static Avahi UI library.
+
+%description ui-static -l pl.UTF-8
+Statyczna biblioteka Avahi UI.
+
+%package ui-devel-common
+Summary:	Header files for Avahi UI library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Avahi UI
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+
+%description ui-devel-common
+Header files for Avahi UI library.
+
+%description ui-devel-common -l pl.UTF-8
+Pliki nagłówkowe biblioteki Avahi GTK+ UI.
+
+%package ui-gtk3
+Summary:	Avahi UI library - GTK+ 3.x version
+Summary(pl.UTF-8):	Biblioteka Avahi UI - wersja dla GTK+ 3.x
+Group:		X11/Libraries
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description ui-gtk3
+Common GTK+ 3.x UI support library for Avahi.
+
+%description ui-gtk3 -l pl.UTF-8
+Biblioteka wspólnego interfejsu użytkownika GTK+ 3.x dla Avahi.
+
+%package ui-gtk3-devel
+Summary:	Header files for Avahi UI library - GTK+ 3.x version
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Avahi UI - wersja dla GTK+ 3.x
+Group:		X11/Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-ui-devel-common = %{version}-%{release}
+Requires:	%{name}-ui-gtk3 = %{version}-%{release}
+
+%description ui-gtk3-devel
+Header files for Avahi GTK+ 3.x UI library.
+
+%description ui-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Avahi GTK+ 3.x UI.
+
+%package ui-gtk3-static
+Summary:	Static Avahi UI library - GTK+ 3.x version
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi UI - wersja GTK+ 3.x
+Group:		X11/Development/Libraries
+Requires:	%{name}-ui-gtk3-devel = %{version}-%{release}
+
+%description ui-gtk3-static
+Static Avahi GTK+ 3.x UI library.
+
+%description ui-gtk3-static -l pl.UTF-8
+Statyczna biblioteka Avahi GTK+ 3.x UI.
+
 %package compat-libdns_sd
 Summary:	Avahi Bonjour compat library
-Summary(pl):	Biblioteka Avahi zgodna z Bonjour
+Summary(pl.UTF-8):	Biblioteka Avahi zgodna z Bonjour
 Group:		Libraries
 Provides:	mdns-bonjour
 Obsoletes:	mDNSResponder-libs
@@ -110,27 +291,27 @@ Obsoletes:	mDNSResponder-libs
 %description compat-libdns_sd
 Avahi Bonjour compat library.
 
-%description compat-libdns_sd -l pl
+%description compat-libdns_sd -l pl.UTF-8
 Biblioteka Avahi zgodna z Bonjour.
 
 %package compat-libdns_sd-devel
 Summary:	Header files for Avahi Bonjour compat library
-Summary(pl):	Pliki nag³ówkowe wi±zañ Avahi dla biblioteki zgodnej z Bonjour
+Summary(pl.UTF-8):	Pliki nagłówkowe wiązań Avahi dla biblioteki zgodnej z Bonjour
 Group:		Development/Libraries
 Requires:	%{name}-compat-libdns_sd = %{version}-%{release}
-Requires:       %{name}-devel = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 Provides:	mdns-bonjour-devel
 Obsoletes:	mDNSResponder-devel
 
 %description compat-libdns_sd-devel
 Header files for Avahi Bonjour compat library.
 
-%description compat-libdns_sd-devel -l pl
-Pliki nag³ówkowe wi±zañ Avahi dla biblioteki zgodnej z Bonjour.
+%description compat-libdns_sd-devel -l pl.UTF-8
+Pliki nagłówkowe wiązań Avahi dla biblioteki zgodnej z Bonjour.
 
 %package compat-libdns_sd-static
 Summary:	Static Avahi Bonjour compat library
-Summary(pl):	Statyczna biblioteka Avahi zgodna z Bonjour
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi zgodna z Bonjour
 Group:		Development/Libraries
 Requires:	%{name}-compat-libdns_sd-devel = %{version}-%{release}
 Provides:	mdns-bonjour-static
@@ -138,12 +319,12 @@ Provides:	mdns-bonjour-static
 %description compat-libdns_sd-static
 Static Avahi Bonjour compat library.
 
-%description compat-libdns_sd-static -l pl
+%description compat-libdns_sd-static -l pl.UTF-8
 Statyczna biblioteka Avahi zgodna z Bonjour.
 
 %package compat-howl
 Summary:	Avahi Howl compat library
-Summary(pl):	Biblioteka Avahi zgodna z Howl
+Summary(pl.UTF-8):	Biblioteka Avahi zgodna z Howl
 Group:		Libraries
 Provides:	mdns-howl-libs
 Obsoletes:	howl-libs
@@ -151,26 +332,27 @@ Obsoletes:	howl-libs
 %description compat-howl
 Avahi Howl compat library.
 
-%description compat-howl -l pl
+%description compat-howl -l pl.UTF-8
 Biblioteka Avahi zgodna z Howl.
 
 %package compat-howl-devel
 Summary:	Header files for Avahi Howl compat library
-Summary(pl):	Pliki nag³ówkowe wi±zañ Avahi dla biblioteki zgodnej z Howl
+Summary(pl.UTF-8):	Pliki nagłówkowe wiązań Avahi dla biblioteki zgodnej z Howl
 Group:		Development/Libraries
 Requires:	%{name}-compat-howl = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 Provides:	mdns-howl-devel
 Obsoletes:	howl-devel
 
 %description compat-howl-devel
 Header files for Avahi Howl compat library.
 
-%description compat-howl-devel -l pl
-Pliki nag³ówkowe wi±zañ Avahi dla biblioteki zgodnej z Howl.
+%description compat-howl-devel -l pl.UTF-8
+Pliki nagłówkowe wiązań Avahi dla biblioteki zgodnej z Howl.
 
 %package compat-howl-static
 Summary:	Static Avahi Howl compat library
-Summary(pl):	Statyczna biblioteka Avahi zgodna z Howl
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi zgodna z Howl
 Group:		Development/Libraries
 Requires:	%{name}-compat-howl-devel = %{version}-%{release}
 Provides:	mdns-howl-static
@@ -179,50 +361,88 @@ Obsoletes:	howl-static
 %description compat-howl-static
 Static Avahi Howl compat library.
 
-%description compat-howl-static -l pl
+%description compat-howl-static -l pl.UTF-8
 Statyczna biblioteka Avahi zgodna z Howl.
 
 %package glib
 Summary:	Avahi GLib library bindings
-Summary(pl):	Wi±zania Avahi dla bibioteki GLib
+Summary(pl.UTF-8):	Wiązania Avahi dla bibioteki GLib
 Group:		Libraries
 
 %description glib
 Avahi GLib library bindings.
 
-%description glib -l pl
-Wi±zania Avahi dla bibioteki GLib.
+%description glib -l pl.UTF-8
+Wiązania Avahi dla bibioteki GLib.
 
 %package glib-devel
 Summary:	Header files for Avahi GLib library bindings
-Summary(pl):	Pliki nag³ówkowe wi±zañ Avahi dla biblioteki GLib
+Summary(pl.UTF-8):	Pliki nagłówkowe wiązań Avahi dla biblioteki GLib
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-glib = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.4.0
+Requires:	glib2-devel >= 1:2.12.2
 
 %description glib-devel
 This is the package containing the header files for Avahi-glib
 library.
 
-%description glib-devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe biblioteki Avahi-glib.
+%description glib-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe biblioteki Avahi-glib.
 
 %package glib-static
 Summary:	Static Avahi GLib library
-Summary(pl):	Statyczna biblioteka Avahi GLib
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi GLib
 Group:		Development/Libraries
 Requires:	%{name}-glib-devel = %{version}-%{release}
 
 %description glib-static
 Static Avahi GLib library.
 
-%description glib-static -l pl
+%description glib-static -l pl.UTF-8
 Statyczna biblioteka Avahi GLib.
 
+%package gobject
+Summary:	Avahi GObject interface
+Summary(pl.UTF-8):	Interfejs GObject do Avahi
+Group:		Libraries
+
+%description gobject
+Avahi GObject interface.
+
+%description gobject -l pl.UTF-8
+Interfejs GObject do Avahi.
+
+%package gobject-devel
+Summary:	Header files for Avahi GObject interface
+Summary(pl.UTF-8):	Pliki nagłówkowe interfejsu GObject do Avahi
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-gobject = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.12.2
+
+%description gobject-devel
+This is the package containing the header files for Avahi GObject
+interface.
+
+%description gobject-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe interfejsu GObject do Avahi.
+
+%package gobject-static
+Summary:	Static Avahi GObject library
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi GObject
+Group:		Development/Libraries
+Requires:	%{name}-gobject-devel = %{version}-%{release}
+
+%description gobject-static
+Static Avahi GObject library.
+
+%description gobject-static -l pl.UTF-8
+Statyczna biblioteka Avahi GObject.
+
 %package qt
 Summary:	Avahi Qt 3 library bindings
-Summary(pl):	Wi±zania Avahi dla biblioteki Qt 3
+Summary(pl.UTF-8):	Wiązania Avahi dla biblioteki Qt 3
 Group:		Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	avahi-qt3
@@ -230,27 +450,27 @@ Obsoletes:	avahi-qt3
 %description qt
 Avahi Qt 3 library bindings.
 
-%description qt -l pl
-Wi±zania Avahi dla biblioteki Qt 3.
+%description qt -l pl.UTF-8
+Wiązania Avahi dla biblioteki Qt 3.
 
 %package qt-devel
 Summary:	Header files for Avahi Qt 3 library bindings
-Summary(pl):	Pliki nag³ówkowe wi±zañ Avahi dla biblioteki Qt 3
+Summary(pl.UTF-8):	Pliki nagłówkowe wiązań Avahi dla biblioteki Qt 3
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-qt = %{version}-%{release}
-Requires:	qt-devel >= 3.0
+Requires:	qt-devel >= 1:3.0
 Obsoletes:	avahi-qt3-devel
 
 %description qt-devel
 Header files for Avahi Qt 3 library bindings.
 
-%description qt-devel -l pl
-Pliki nag³ówkowe wi±zañ Avahi dla biblioteki Qt 3.
+%description qt-devel -l pl.UTF-8
+Pliki nagłówkowe wiązań Avahi dla biblioteki Qt 3.
 
 %package qt-static
 Summary:	Static Avahi Qt 3 library
-Summary(pl):	Statyczna biblioteka Avahi Qt 3
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi Qt 3
 Group:		Development/Libraries
 Requires:	%{name}-qt-devel = %{version}-%{release}
 Obsoletes:	avahi-qt3-static
@@ -258,73 +478,113 @@ Obsoletes:	avahi-qt3-static
 %description qt-static
 Static Avahi Qt 3 library.
 
-%description qt-static -l pl
+%description qt-static -l pl.UTF-8
 Statyczna biblioteka Avahi Qt 3.
 
 %package Qt
 Summary:	Avahi Qt 4 library bindings
-Summary(pl):	Wi±zania Avahi dla biblioteki Qt 4
+Summary(pl.UTF-8):	Wiązania Avahi dla biblioteki Qt 4
 Group:		Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description Qt
 Avahi Qt 4 library bindings.
 
-%description Qt -l pl
-Wi±zania Avahi dla biblioteki Qt 4.
+%description Qt -l pl.UTF-8
+Wiązania Avahi dla biblioteki Qt 4.
 
 %package Qt-devel
-Summary:	Header files for Avahi Qt 3 library bindings
-Summary(pl):	Pliki nag³ówkowe wi±zañ Avahi dla biblioteki Qt 3
+Summary:	Header files for Avahi Qt 4 library bindings
+Summary(pl.UTF-8):	Pliki nagłówkowe wiązań Avahi dla biblioteki Qt 4
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
 Requires:	%{name}-Qt = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description Qt-devel
 Header files for Avahi Qt 4 library bindings.
 
-%description Qt-devel -l pl
-Pliki nag³ówkowe wi±zañ Avahi dla biblioteki Qt 4.
+%description Qt-devel -l pl.UTF-8
+Pliki nagłówkowe wiązań Avahi dla biblioteki Qt 4.
 
 %package Qt-static
 Summary:	Static Avahi Qt 4 library
-Summary(pl):	Statyczna biblioteka Avahi Qt 4
+Summary(pl.UTF-8):	Statyczna biblioteka Avahi Qt 4
 Group:		Development/Libraries
 Requires:	%{name}-Qt-devel = %{version}-%{release}
 
 %description Qt-static
 Static Avahi Qt 4 library.
 
-%description Qt-static -l pl
+%description Qt-static -l pl.UTF-8
 Statyczna biblioteka Avahi Qt 4.
 
+%package -n python-avahi
+Summary:	Avahi Python bindings
+Summary(pl.UTF-8):	Wiązania Avahi dla Pythona
+Group:		Development/Languages/Python
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	python-dbus >= 0.71
+
+%description -n python-avahi
+Avahi Python bindings.
+
+%description -n python-avahi -l pl.UTF-8
+Wiązania Avahi dla Pythona.
+
 %package -n dotnet-avahi
 Summary:	Avahi MONO bindings
-Summary(pl):	Wi±zania Avahi dla MONO
+Summary(pl.UTF-8):	Wiązania Avahi dla MONO
 Group:		Libraries
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n dotnet-avahi
 Avahi MONO bindings.
 
-%description -n dotnet-avahi -l pl
-Wi±zania Avahi dla MONO.
+%description -n dotnet-avahi -l pl.UTF-8
+Wiązania Avahi dla MONO.
 
 %package -n dotnet-avahi-devel
 Summary:	Development files for MONO Avahi bindings
-Summary(pl):	Pliki rozwojowe wi±zañ Avahi dla MONO
+Summary(pl.UTF-8):	Pliki rozwojowe wiązań Avahi dla MONO
 Group:		Development/Libraries
 Requires:	dotnet-avahi = %{version}-%{release}
-Requires:	monodoc
+Requires:	monodoc >= 2.6
 
 %description -n dotnet-avahi-devel
 Development files for MONO Avahi bindings.
 
-%description -n dotnet-avahi-devel -l pl
-Pliki rozwojowe wi±zañ Avahi dla MONO.
+%description -n dotnet-avahi-devel -l pl.UTF-8
+Pliki rozwojowe wiązań Avahi dla MONO.
+
+%package -n dotnet-avahi-ui
+Summary:	Avahi UI MONO bindings
+Summary(pl.UTF-8):	Wiązania Avahi UI dla MONO
+Group:		X11/Libraries
+Requires:	%{name}-ui = %{version}-%{release}
+Requires:	dotnet-avahi = %{version}-%{release}
+
+%description -n dotnet-avahi-ui
+Avahi UI MONO bindings.
+
+%description -n dotnet-avahi-ui -l pl.UTF-8
+Wiązania Avahi UI dla MONO.
+
+%package -n dotnet-avahi-ui-devel
+Summary:	Development files for MONO Avahi UI bindings
+Summary(pl.UTF-8):	Pliki rozwojowe wiązań Avahi UI dla MONO
+Group:		X11/Development/Libraries
+Requires:	dotnet-avahi-ui = %{version}-%{release}
+Requires:	monodoc >= 2.6
+
+%description -n dotnet-avahi-ui-devel
+Development files for MONO Avahi UI bindings.
+
+%description -n dotnet-avahi-ui-devel -l pl.UTF-8
+Pliki rozwojowe wiązań Avahi UI dla MONO.
 
 %package bookmarks
 Summary:	Miniature web server
-Summary(pl):	Miniaturowy serwer web
+Summary(pl.UTF-8):	Miniaturowy serwer WWW
 Group:		Applications
 
 %description bookmarks
@@ -332,78 +592,98 @@ A Python based miniature web server that browses for mDNS/DNS-SD
 services of type '_http._tcp' (i.e. web sites) and makes them
 available as HTML links on http://localhost:8080/.
 
-%description bookmarks -l pl
-Napisany w Pythonie miniaturowy serwer WWW, pozwalaj±cy na
-przegl±danie us³ug typu '_http._tcp' (np. stron WWW) i udostêpniaj±cy
-je jako odno¶niki HTML na http://localhost:8080/.
+%description bookmarks -l pl.UTF-8
+Napisany w Pythonie miniaturowy serwer WWW, pozwalający na
+przeglądanie usług typu '_http._tcp' (np. stron WWW) i udostępniający
+je jako odnośniki HTML na http://localhost:8080/.
 
 %package discover
 Summary:	Avahi Zeroconf browser
-Summary(pl):	Przegl±darka Zeroconf Avahi
+Summary(pl.UTF-8):	Przeglądarka Zeroconf Avahi
 Group:		Applications
+Requires:	python-avahi = %{version}-%{release}
+Requires:	python-pygtk-glade >= 2:2.9.6
 
 %description discover
 A tool for enumerating all available services on the local LAN
 (python-pygtk implementation).
 
-%description discover -l pl
-Narzêdzie wymieniaj±ce wszystkie dostêpne us³ugi w sieci lokalnej LAN
+%description discover -l pl.UTF-8
+Narzędzie wymieniające wszystkie dostępne usługi w sieci lokalnej LAN
 (implementacja w python-pygtk).
 
 %package discover-standalone
 Summary:	Avahi Zeroconf browser
-Summary(pl):	Przegl±darka Zeroconf Avahi
+Summary(pl.UTF-8):	Przeglądarka Zeroconf Avahi
 Group:		Applications
+Requires:	%{name}-glib = %{version}-%{release}
 
 %description discover-standalone
 GTK+ tool for enumerating all available services on the local LAN.
 
-%description discover-standalone -l pl
-Narzêdzie GTK+ wymieniaj±ce wszystkie dostêpne us³ugi w sieci lokalnej
+%description discover-standalone -l pl.UTF-8
+Narzędzie GTK+ wymieniające wszystkie dostępne usługi w sieci lokalnej
 LAN.
 
 %package utils
 Summary:	Avahi CLI utilities
-Summary(pl):	Narzêdzia CLI Avahi
+Summary(pl.UTF-8):	Narzędzia CLI Avahi
 Group:		Applications
 
 %description utils
 Command line utilities using avahi-client.
 
-%description utils -l pl
-Narzêdzia linii poleceñ korzystaj±ce z avahi-client.
+%description utils -l pl.UTF-8
+Narzędzia linii poleceń korzystające z avahi-client.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I common
 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--enable-compat-libdns_sd \
 	--enable-compat-howl \
 	--with-distro=none \
-	%{!?with_qt:--disable-qt3 --disable-qt4} \
+	%{!?with_apidocs:--disable-doxygen-doc} \
+	%{!?with_gtk:--disable-gtk} \
+	%{!?with_gtk3:--disable-gtk3} \
+	%{!?with_pygtk:--disable-pygtk} \
+	%{!?with_qt3:--disable-qt3} \
+	%{!?with_qt4:--disable-qt4} \
 	%{!?with_dotnet:--disable-mono} \
-	%{!?with_dotnet:--disable-monodoc}
+	%{!?with_dotnet:--disable-monodoc} \
+	--with-avahi-priv-access-group=adm \
+	--with-autoipd-user=avahi \
+	--with-autoipd-group=avahi
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d}
+install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d,/etc/init}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pythondir=%{py_sitedir}
 
-install %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+install -p %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
+
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/init/avahi-daemon.conf
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/init/avahi-dnsconfd.conf
 
 ln -sf %{_includedir}/avahi-compat-libdns_sd/dns_sd.h \
 	$RPM_BUILD_ROOT%{_includedir}/dns_sd.h
@@ -411,7 +691,22 @@ ln -sf %{_includedir}/avahi-compat-libdns_sd/dns_sd.h \
 ln -sf %{_pkgconfigdir}/avahi-compat-howl.pc \
 	$RPM_BUILD_ROOT%{_pkgconfigdir}/howl.pc
 
-rm -f $RPM_BUILD_ROOT%{py_sitedir}/avahi/{__init__,SimpleGladeApp}.py
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_postclean
+
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{avahi-{browse-domains,publish-address,publish-service,resolve-address,resolve-host-name},bvnc}.1
+echo '.so avahi-browse.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-browse-domains.1
+echo '.so avahi-publish.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-publish-address.1
+echo '.so avahi-publish.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-publish-service.1
+echo '.so avahi-resolve.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-resolve-address.1
+echo '.so avahi-resolve.1' > $RPM_BUILD_ROOT%{_mandir}/man1/avahi-resolve-host-name.1
+echo '.so bssh.1' > $RPM_BUILD_ROOT%{_mandir}/man1/bvnc.1
+echo '.so bssh.1' > $RPM_BUILD_ROOT%{_mandir}/man1/bshell.1
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -420,6 +715,10 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 165 -r -f avahi
 %useradd -u 165 -r -d /usr/share/empty -s /bin/false -c "Avahi daemon" -g avahi avahi
 
+%pre autoipd
+%groupadd -g 165 -r -f avahi
+%useradd -u 165 -r -d /usr/share/empty -s /bin/false -c "Avahi daemon" -g avahi avahi
+
 %post
 /sbin/chkconfig --add %{name}-daemon
 %service %{name}-daemon restart
@@ -436,13 +735,33 @@ fi
 
 %postun
 if [ "$1" = "0" ]; then
-        %userremove avahi
+	%userremove avahi
 	%groupremove avahi
 fi
 
+%postun autoipd
+if [ "$1" = "0" ]; then
+	%userremove avahi
+	%groupremove avahi
+fi
+
+%post upstart
+%upstart_post avahi-daemon
+%upstart_post avahi-dnsconfd
+
+%postun upstart
+%upstart_postun avahi-daemon
+%upstart_postun avahi-dnsconfd
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post	ui -p /sbin/ldconfig
+%postun	ui -p /sbin/ldconfig
+
+%post	ui-gtk3 -p /sbin/ldconfig
+%postun	ui-gtk3 -p /sbin/ldconfig
+
 %post	compat-libdns_sd -p /sbin/ldconfig
 %postun	compat-libdns_sd -p /sbin/ldconfig
 
@@ -452,6 +771,9 @@ fi
 %post	glib -p /sbin/ldconfig
 %postun	glib -p /sbin/ldconfig
 
+%post	gobject -p /sbin/ldconfig
+%postun	gobject -p /sbin/ldconfig
+
 %post	qt -p /sbin/ldconfig
 %postun	qt -p /sbin/ldconfig
 
@@ -468,32 +790,59 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/avahi-dnsconfd.action
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/hosts
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/services/ssh.service
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/avahi/services/sftp-ssh.service
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 
-%attr(755,root,root) %{_bindir}/avahi-browse
-%attr(755,root,root) %{_bindir}/avahi-publish
-%attr(755,root,root) %{_bindir}/avahi-resolve
+%attr(755,root,root) %{_bindir}/avahi-set-host-name
 
 %attr(755,root,root) %{_sbindir}/avahi-daemon
 %attr(755,root,root) %{_sbindir}/avahi-dnsconfd
-
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/introspection
-%{_datadir}/%{name}/introspection/*.introspect
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/service-types.db
+#%%dir %{_datadir}/%{name}/introspection
+#%%{_datadir}/%{name}/introspection/*.introspect
 %{_datadir}/%{name}/avahi-service.dtd
 %{_datadir}/%{name}/service-types
-%{_datadir}/%{name}/service-types.db
+%{_datadir}/dbus-1/interfaces/org.freedesktop.Avahi.*.xml
 
-%{_mandir}/man*/*
+%{_mandir}/man1/avahi-set-host-name.1*
+%{_mandir}/man5/avahi-daemon.conf.5*
+%{_mandir}/man5/avahi.hosts.5*
+%{_mandir}/man5/avahi.service.5*
+%{_mandir}/man8/avahi-daemon.8*
+%{_mandir}/man8/avahi-dnsconfd.8*
+%{_mandir}/man8/avahi-dnsconfd.action.8*
 
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 
-%files libs
+%if "%{pld_release}" != "ti"
+%files upstart
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/init/*.conf
+%endif
+
+%files autoipd
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/avahi
+%attr(755,root,root) %{_sysconfdir}/%{name}/avahi-autoipd.action
+%config(noreplace) %verify(not md5 mtime size) /etc/dhclient-enter-hooks.d/avahi-autoipd
+%config(noreplace) %verify(not md5 mtime size) /etc/dhclient-exit-hooks.d/avahi-autoipd
+%attr(755,root,root) %{_sbindir}/avahi-autoipd
+%{_mandir}/man8/avahi-autoipd.8*
+%{_mandir}/man8/avahi-autoipd.action.8*
+
+%files libs -f %{name}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-client.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-client.so.3
 %attr(755,root,root) %{_libdir}/libavahi-common.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-common.so.3
 %attr(755,root,root) %{_libdir}/libavahi-core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-core.so.7
+# common for -discover*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/interfaces
 
 %files devel
 %defattr(644,root,root,755)
@@ -501,9 +850,6 @@ fi
 %attr(755,root,root) %{_libdir}/libavahi-client.so
 %attr(755,root,root) %{_libdir}/libavahi-common.so
 %attr(755,root,root) %{_libdir}/libavahi-core.so
-%{_libdir}/libavahi-client.la
-%{_libdir}/libavahi-common.la
-%{_libdir}/libavahi-core.la
 %{_includedir}/avahi-client
 %{_includedir}/avahi-common
 %{_includedir}/avahi-core
@@ -516,14 +862,70 @@ fi
 %{_libdir}/libavahi-common.a
 %{_libdir}/libavahi-core.a
 
+%if %{with gtk}
+%files ui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-ui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0
+%if %{without gtk3}
+%attr(755,root,root) %{_bindir}/bshell
+%attr(755,root,root) %{_bindir}/bssh
+%attr(755,root,root) %{_bindir}/bvnc
+%{_mandir}/man1/bshell.1*
+%{_mandir}/man1/bssh.1*
+%{_mandir}/man1/bvnc.1*
+%{_desktopdir}/bssh.desktop
+%{_desktopdir}/bvnc.desktop
+%endif
+
+%files ui-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-ui.so
+%{_pkgconfigdir}/avahi-ui.pc
+
+%files ui-static
+%defattr(644,root,root,755)
+%{_libdir}/libavahi-ui.a
+%endif
+
+%if %{with gtk} || %{with gtk3}
+%files ui-devel-common
+%defattr(644,root,root,755)
+%{_includedir}/avahi-ui
+%endif
+
+%if %{with gtk3}
+%files ui-gtk3
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/bshell
+%attr(755,root,root) %{_bindir}/bssh
+%attr(755,root,root) %{_bindir}/bvnc
+%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-ui-gtk3.so.0
+%{_mandir}/man1/bshell.1*
+%{_mandir}/man1/bssh.1*
+%{_mandir}/man1/bvnc.1*
+%{_desktopdir}/bssh.desktop
+%{_desktopdir}/bvnc.desktop
+
+%files ui-gtk3-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-ui-gtk3.so
+%{_pkgconfigdir}/avahi-ui-gtk3.pc
+
+%files ui-gtk3-static
+%defattr(644,root,root,755)
+%{_libdir}/libavahi-ui-gtk3.a
+%endif
+
 %files compat-libdns_sd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdns_sd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdns_sd.so.1
 
 %files compat-libdns_sd-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdns_sd.so
-%{_libdir}/libdns_sd.la
 %{_includedir}/avahi-compat-libdns_sd
 %{_includedir}/dns_sd.h
 %{_pkgconfigdir}/avahi-compat-libdns_sd.pc
@@ -535,11 +937,11 @@ fi
 %files compat-howl
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhowl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libhowl.so.0
 
 %files compat-howl-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libhowl.so
-%{_libdir}/libhowl.la
 %{_includedir}/avahi-compat-howl
 %{_pkgconfigdir}/avahi-compat-howl.pc
 %{_pkgconfigdir}/howl.pc
@@ -548,6 +950,10 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libhowl.a
 
+%files -n python-avahi
+%defattr(644,root,root,755)
+%{py_sitedir}/avahi
+
 %if %{with dotnet}
 %files -n dotnet-avahi
 %defattr(644,root,root,755)
@@ -555,18 +961,29 @@ fi
 
 %files -n dotnet-avahi-devel
 %defattr(644,root,root,755)
-%{_libdir}/monodoc/sources/avahi-*
+%{_prefix}/lib/mono/avahi-sharp
+%{_prefix}/lib/monodoc/sources/avahi-sharp-docs.*
 %{_pkgconfigdir}/avahi-sharp.pc
+
+%files -n dotnet-avahi-ui
+%defattr(644,root,root,755)
+%{_prefix}/lib/mono/gac/avahi-ui-sharp
+
+%files -n dotnet-avahi-ui-devel
+%defattr(644,root,root,755)
+%{_prefix}/lib/mono/avahi-ui-sharp
+%{_prefix}/lib/monodoc/sources/avahi-ui-sharp-docs.*
+%{_pkgconfigdir}/avahi-ui-sharp.pc
 %endif
 
 %files glib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-glib.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-glib.so.1
 
 %files glib-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-glib.so
-%{_libdir}/libavahi-glib.la
 %{_includedir}/avahi-glib
 %{_pkgconfigdir}/avahi-glib.pc
 
@@ -574,30 +991,51 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libavahi-glib.a
 
-%if %{with qt}
+%files gobject
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-gobject.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-gobject.so.0
+%{_libdir}/girepository-1.0/Avahi-0.6.typelib
+%{_libdir}/girepository-1.0/AvahiCore-0.6.typelib
+
+%files gobject-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-gobject.so
+%{_includedir}/avahi-gobject
+%{_pkgconfigdir}/avahi-gobject.pc
+%{_datadir}/gir-1.0/Avahi-0.6.gir
+%{_datadir}/gir-1.0/AvahiCore-0.6.gir
+
+%files gobject-static
+%defattr(644,root,root,755)
+%{_libdir}/libavahi-gobject.a
+
+%if %{with qt3}
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-qt3.so.1
 
 %files qt-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so
-%{_libdir}/libavahi-qt3.la
 %{_includedir}/avahi-qt3
 %{_pkgconfigdir}/avahi-qt3.pc
 
 %files qt-static
 %defattr(644,root,root,755)
 %{_libdir}/libavahi-qt3.a
+%endif
 
+%if %{with qt4}
 %files Qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-qt4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-qt4.so.1
 
 %files Qt-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-qt4.so
-%{_libdir}/libavahi-qt4.la
 %{_includedir}/avahi-qt4
 %{_pkgconfigdir}/avahi-qt4.pc
 
@@ -609,26 +1047,41 @@ fi
 %files bookmarks
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-bookmarks
+%{_mandir}/man1/avahi-bookmarks.1*
 
+%if %{with pygtk}
 %files discover
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-discover
-# XXX: possibly missing %{_datadir}/%{name} dir, shared subdir
-%dir %{_datadir}/%{name}/interfaces
-%{_datadir}/%{name}/interfaces/avahi-discover.glade
-%{py_sitedir}/avahi
-%{_desktopdir}/*.desktop
+%{py_sitedir}/avahi_discover
+%{_datadir}/%{name}/interfaces/avahi-discover.ui
+%{_desktopdir}/avahi-discover.desktop
 %{_pixmapsdir}/avahi.png
+%{_mandir}/man1/avahi-discover.1*
+%endif
 
+%if %{with gtk}
 %files discover-standalone
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-discover-standalone
-# XXX: possibly missing %{_datadir}/%{name} dir, shared subdir
-%dir %{_datadir}/%{name}/interfaces
 %{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade
+%endif
 
 %files utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-browse
+%attr(755,root,root) %{_bindir}/avahi-browse-domains
 %attr(755,root,root) %{_bindir}/avahi-publish
+%attr(755,root,root) %{_bindir}/avahi-publish-address
+%attr(755,root,root) %{_bindir}/avahi-publish-service
 %attr(755,root,root) %{_bindir}/avahi-resolve
+%attr(755,root,root) %{_bindir}/avahi-resolve-address
+%attr(755,root,root) %{_bindir}/avahi-resolve-host-name
+%{_mandir}/man1/avahi-browse.1*
+%{_mandir}/man1/avahi-browse-domains.1*
+%{_mandir}/man1/avahi-publish.1*
+%{_mandir}/man1/avahi-publish-address.1*
+%{_mandir}/man1/avahi-publish-service.1*
+%{_mandir}/man1/avahi-resolve.1*
+%{_mandir}/man1/avahi-resolve-address.1*
+%{_mandir}/man1/avahi-resolve-host-name.1*