X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avahi.spec;h=2b2c9b422b80bca01bb1a36971a1c35b1e2953b8;hb=18dae8bee1b4fc53af40366419441777a0757ce0;hp=cf78599a6a7191b3541d27d5e1fd6d92d59df554;hpb=eafa6e05bef05630edd06864995d2b182901c777;p=packages%2Favahi.git

diff --git a/avahi.spec b/avahi.spec
index cf78599..2b2c9b4 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,53 +1,67 @@
 #
+# TODO:
+# - autoip subpackage ?
+# - autoip start script ?
+#
 # Conditional build:
-%bcond_without	dotnet		# build with dotnet bindings
-%bcond_without	qt		# build with qt bindings
+%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 !%{with qt}
+%undefine	with_qt3
+%undefine	with_qt4
+%endif
 %include /usr/lib/rpm/macros.mono
 #
 Summary:	Free mDNS/DNS-SD implementation
 Summary(pl):	Wolna implementacja mDNS/DNS-SD
 Name:		avahi
-Version:	0.6.9
-Release:	4
+Version:	0.6.15
+Release:	2
 License:	GPL v.2/LGPL
 Group:		Applications
-Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	2652910f0e52c373d7a15b6851750517
+Source0:	http://lathiat.net/%{name}-%{version}.tar.gz
+# Source0-md5:	94dbd41336d18c47fc8213735a3fbf8e
 Source1:	%{name}-daemon
 Source2:	%{name}-dnsconfd
 Source3:	%{name}.png
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-glade.patch
 Patch2:		%{name}-destdir.patch
+Patch3:		%{name}-dbus.patch
 URL:		http://avahi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-devel >= 0.34
+BuildRequires:	dbus-devel >= 0.92
 BuildRequires:	doxygen
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
-BuildRequires:	glib2-devel >= 1:2.4.0
+BuildRequires:	glib2-devel >= 1:2.12.2
 BuildRequires:	graphviz
-BuildRequires:	gtk+2-devel >= 2:2.4.0
+BuildRequires:	gtk+2-devel >= 2:2.10.2
 BuildRequires:	libdaemon-devel >= 0.5
-BuildRequires:	libglade2-devel >= 1:2.5.1-5
+BuildRequires:	libglade2-devel >= 1:2.6.0
 BuildRequires:	libtool
 %if %{with dotnet}
 BuildRequires:	mono-csharp
 BuildRequires:	monodoc
 %endif
 BuildRequires:	pkgconfig
-BuildRequires:	python-dbus
-BuildRequires:	python-pygtk-devel
-%if %{with qt}
-BuildRequires:	QtCore-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
+%endif
+%if %{with qt4}
+BuildRequires:	QtCore-devel
 BuildRequires:	qt4-build
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.228
 Requires(post,preun):	/sbin/chkconfig
-Requires:	dbus >= 0.60-2
+Requires:	dbus >= 0.92
 Requires:	%{name}-libs = %{version}-%{release}
 Provides:	group(avahi)
 Provides:	user(avahi)
@@ -79,7 +93,7 @@ Summary:	Header files for Avahi library
 Summary(pl):	Pliki nag³ówkowe biblioteki Avahi
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	dbus-devel
+Requires:	dbus-devel >= 0.92
 Requires:	expat-devel
 Requires:	libdaemon-devel >= 0.5
 
@@ -119,7 +133,7 @@ Summary:	Header files for Avahi Bonjour compat library
 Summary(pl):	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
 
@@ -160,6 +174,7 @@ Summary:	Header files for Avahi Howl compat library
 Summary(pl):	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
 
@@ -200,7 +215,7 @@ Summary(pl):	Pliki nag
 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
@@ -342,6 +357,9 @@ je jako odno
 Summary:	Avahi Zeroconf browser
 Summary(pl):	Przegl±darka Zeroconf Avahi
 Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-dbus >= 0.71
+Requires:	python-pygtk-glade >= 2:2.9.6
 
 %description discover
 A tool for enumerating all available services on the local LAN
@@ -355,6 +373,9 @@ Narz
 Summary:	Avahi Zeroconf browser
 Summary(pl):	Przegl±darka Zeroconf Avahi
 Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	python-dbus >= 0.71
+Requires:	python-pygtk-glade >= 2:2.9.6
 
 %description discover-standalone
 GTK+ tool for enumerating all available services on the local LAN.
@@ -379,6 +400,7 @@ Narz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -390,7 +412,8 @@ Narz
 	--enable-compat-libdns_sd \
 	--enable-compat-howl \
 	--with-distro=none \
-	%{!?with_qt:--disable-qt3 --disable-qt4} \
+	%{!?with_qt3:--disable-qt3} \
+	%{!?with_qt4:--disable-qt4} \
 	%{!?with_dotnet:--disable-mono} \
 	%{!?with_dotnet:--disable-monodoc}
 %{__make}
@@ -469,11 +492,10 @@ 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
@@ -490,6 +512,9 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-daemon
 %attr(754,root,root) /etc/rc.d/init.d/%{name}-dnsconfd
 
+%attr(755,root,root) %{_sysconfdir}/%{name}/avahi-autoipd.action
+%attr(755,root,root) %{_sbindir}/avahi-autoipd
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-client.so.*.*.*
@@ -557,6 +582,7 @@ fi
 %files -n dotnet-avahi-devel
 %defattr(644,root,root,755)
 %{_libdir}/monodoc/sources/avahi-*
+%{_prefix}/lib/mono/avahi-sharp
 %{_pkgconfigdir}/avahi-sharp.pc
 %endif
 
@@ -575,7 +601,7 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libavahi-glib.a
 
-%if %{with qt}
+%if %{with qt3}
 %files qt
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libavahi-qt3.so.*.*.*
@@ -590,7 +616,9 @@ fi
 %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.*.*.*