- use functions

[packages/avahi.git] / avahi.spec

diff --git a/avahi.spec b/avahi.spec
index 49fb227bb4b2a3dc164c6e9b699681eda96c4a47..2b2c9b422b80bca01bb1a36971a1c35b1e2953b8 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,11 +1,15 @@
 #
+# 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}
+%if !%{with qt}
 %undefine      with_qt3
 %undefine      with_qt4
 %endif
@@ -14,18 +18,19 @@
 Summary:       Free mDNS/DNS-SD implementation
 Summary(pl):   Wolna implementacja mDNS/DNS-SD
 Name:          avahi
-Version:       0.6.13
-Release:       1
+Version:       0.6.15
+Release:       2
 License:       GPL v.2/LGPL
 Group:         Applications
-Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: d1000689979105cc95b9ca102284aae4
+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
@@ -44,6 +49,7 @@ BuildRequires:        mono-csharp
 BuildRequires: monodoc
 %endif
 BuildRequires: pkgconfig
+BuildRequires: python >= 1:2.4
 BuildRequires: python-dbus >= 0.71
 BuildRequires: python-pygtk-devel >= 2:2.9.6
 %if %{with qt3}
@@ -394,6 +400,7 @@ Narz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -485,11 +492,9 @@ 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
@@ -507,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.*.*.*