X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avahi.spec;h=1982a08fadcbdf1f7cdea17f2d7d5c61d31a33c3;hb=f967b3791642580d1c06a4e36eb2367b2e7c86ad;hp=728cb5d67b6bb12206b992fb150781cc19f4e7e3;hpb=4f23673d24eaba2e01b62b2290ed75002eba17f9;p=packages%2Favahi.git

diff --git a/avahi.spec b/avahi.spec
index 728cb5d..1982a08 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,53 +1,69 @@
 #
+# TODO:
+# - autoip subpackage ?
+# - autoip start script ?
+#
 # Conditional build:
 %bcond_without	dotnet		# build without dotnet bindings
 %bcond_without	qt		# build without (any) qt bindings
 %bcond_without	qt3		# build without qt3 bindings
 %bcond_without	qt4		# build without qt4 bindings
 #
-%if %{without qt}
+%ifnarch %{ix86} %{x8664} alpha arm hppa ia64 mips ppc s390 s390x sparc sparcv9
+%undefine with_dotnet
+%endif
+%ifarch i386
+%undefine with_dotnet
+%endif
+
+%if !%{with qt}
 %undefine	with_qt3
 %undefine	with_qt4
 %endif
-%include /usr/lib/rpm/macros.mono
+%{?with_dotnet:%include /usr/lib/rpm/macros.mono}
 #
 Summary:	Free mDNS/DNS-SD implementation
-Summary(pl):	Wolna implementacja mDNS/DNS-SD
+Summary(pl.UTF-8):	Wolna implementacja mDNS/DNS-SD
 Name:		avahi
-Version:	0.6.10
-Release:	3
-License:	GPL v.2/LGPL
+Version:	0.6.24
+Release:	2
+License:	LGPL v2.1+
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	cfb9e05c138dff4c430a35eee6229e8a
+# Source0-md5:	068c1d220b07037e64caf87d4a7a0504
 Source1:	%{name}-daemon
 Source2:	%{name}-dnsconfd
 Source3:	%{name}.png
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-glade.patch
 Patch2:		%{name}-destdir.patch
+Patch3:		%{name}-mono-dir.patch
 URL:		http://avahi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-devel >= 0.62
+BuildRequires:	dbus-devel >= 0.92
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
-BuildRequires:	glib2-devel >= 1:2.11.4
+BuildRequires:	glib2-devel >= 1:2.12.2
 BuildRequires:	graphviz
-BuildRequires:	gtk+2-devel >= 2:2.9.4
-BuildRequires:	libdaemon-devel >= 0.5
-BuildRequires:	libglade2-devel >= 1:2.5.1-5
+BuildRequires:	gtk+2-devel >= 2:2.10.2
+BuildRequires:	intltool >= 0.35
+BuildRequires:	libcap-devel
+BuildRequires:	libdaemon-devel >= 0.11
+BuildRequires:	libglade2-devel >= 1:2.6.0
 BuildRequires:	libtool
 %if %{with dotnet}
+BuildRequires:	dotnet-gtk-sharp2-devel >= 2.10
 BuildRequires:	mono-csharp
 BuildRequires:	monodoc
 %endif
 BuildRequires:	pkgconfig
-BuildRequires:	python-dbus
-BuildRequires:	python-pygtk-devel
+BuildRequires:	python >= 1:2.4
+BuildRequires:	python-dbus >= 0.71
+BuildRequires:	python-pygtk-devel >= 2:2.9.6
 %if %{with qt3}
-BuildRequires:	qt-devel >= 3.0
+BuildRequires:	qt-devel >= 1:3.0
 %endif
 %if %{with qt4}
 BuildRequires:	QtCore-devel
@@ -55,8 +71,9 @@ BuildRequires:	qt4-build
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
-Requires:	dbus >= 0.62
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	dbus >= 0.92
+Requires:	libdaemon >= 0.11
 Provides:	group(avahi)
 Provides:	user(avahi)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,52 +83,90 @@ 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 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.62
+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.10.2
+
+%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:	gtk+2-devel >= 2:2.10.2
+
+%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 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
@@ -119,12 +174,12 @@ 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}
@@ -134,12 +189,12 @@ 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
@@ -147,12 +202,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
@@ -160,12 +215,12 @@ 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}
@@ -175,12 +230,12 @@ 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
@@ -189,50 +244,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
@@ -240,27 +333,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
@@ -268,24 +361,24 @@ 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}
@@ -293,35 +386,49 @@ Requires:	%{name}-Qt = %{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
@@ -329,12 +436,38 @@ Requires:	monodoc
 %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
+
+%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 web
 Group:		Applications
 
 %description bookmarks
@@ -342,60 +475,59 @@ 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:	%{name} = %{version}-%{release}
-Requires:	python-dbus
-Requires:	python-pygtk-glade
+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} = %{version}-%{release}
-Requires:	python-dbus
-Requires:	python-pygtk-glade
+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
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I common
 %{__autoconf}
@@ -428,7 +560,18 @@ 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
+rm -f $RPM_BUILD_ROOT%{py_sitedir}/avahi/{__init__,SimpleGladeApp}.py \
+	$RPM_BUILD_ROOT%{py_sitedir}/avahi_discover/*.py
+
+rm -f $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
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -460,6 +603,9 @@ fi
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post	ui -p /sbin/ldconfig
+%postun	ui -p /sbin/ldconfig
+
 %post	compat-libdns_sd -p /sbin/ldconfig
 %postun	compat-libdns_sd -p /sbin/ldconfig
 
@@ -469,6 +615,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
 
@@ -485,32 +634,48 @@ 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}/avahi/services/sftp-ssh.service
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/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
 %{_datadir}/%{name}/avahi-service.dtd
 %{_datadir}/%{name}/service-types
-%{_datadir}/%{name}/service-types.db
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/service-types.db
 
-%{_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
+%attr(755,root,root) %{_sysconfdir}/%{name}/avahi-autoipd.action
+%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.6
+# common for -discover*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/interfaces
 
 %files devel
 %defattr(644,root,root,755)
@@ -533,9 +698,33 @@ fi
 %{_libdir}/libavahi-common.a
 %{_libdir}/libavahi-core.a
 
+%files ui
+%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.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libavahi-ui.so.0
+%{_mandir}/man1/bssh.1*
+%{_mandir}/man1/bvnc.1*
+%{_desktopdir}/bssh.desktop
+%{_desktopdir}/bvnc.desktop
+
+%files ui-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-ui.so
+%{_libdir}/libavahi-ui.la
+%{_includedir}/avahi-ui
+%{_pkgconfigdir}/avahi-ui.pc
+
+%files ui-static
+%defattr(644,root,root,755)
+%{_libdir}/libavahi-ui.a
+
 %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)
@@ -552,6 +741,7 @@ 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)
@@ -565,6 +755,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)
@@ -572,14 +766,25 @@ fi
 
 %files -n dotnet-avahi-devel
 %defattr(644,root,root,755)
-%{_libdir}/monodoc/sources/avahi-*
 %{_prefix}/lib/mono/avahi-sharp
+%{_libdir}/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
+%{_libdir}/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)
@@ -592,10 +797,27 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libavahi-glib.a
 
+%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
+
+%files gobject-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libavahi-gobject.so
+%{_libdir}/libavahi-gobject.la
+%{_includedir}/avahi-gobject
+%{_pkgconfigdir}/avahi-gobject.pc
+
+%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)
@@ -613,6 +835,7 @@ fi
 %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)
@@ -629,26 +852,37 @@ fi
 %files bookmarks
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-bookmarks
+%{_mandir}/man1/avahi-bookmarks.1*
 
 %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
+%{py_sitedir}/avahi_discover
 %{_datadir}/%{name}/interfaces/avahi-discover.glade
-%{py_sitedir}/avahi
-%{_desktopdir}/*.desktop
+%{_desktopdir}/avahi-discover.desktop
 %{_pixmapsdir}/avahi.png
+%{_mandir}/man1/avahi-discover.1*
 
 %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
 
 %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*