- use nss_mdns when referring to nss-mdns as that is our package name; rel 3

[packages/avahi.git] / avahi.spec

diff --git a/avahi.spec b/avahi.spec
index 01e2b73377093cc8e39196a4faf7c7d4ad007879..d3c08fa8886c2e08c2e2c713c31b6d2d50cda86b 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,4 +1,3 @@
-#
 # TODO:
 # - autoip subpackage ?
 # - autoip start script ?
@@ -8,7 +7,7 @@
 %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
@@ -16,21 +15,21 @@
 %undefine with_dotnet
 %endif
 
-%if !%{with qt}
+%if %{without qt}
 %undefine      with_qt3
 %undefine      with_qt4
 %endif
+
 %{?with_dotnet:%include /usr/lib/rpm/macros.mono}
-#
 Summary:       Free mDNS/DNS-SD implementation
 Summary(pl.UTF-8):     Wolna implementacja mDNS/DNS-SD
 Name:          avahi
-Version:       0.6.23
-Release:       1
+Version:       0.6.25
+Release:       3
 License:       LGPL v2.1+
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: aab1a304851d8145ea5f6a85c10af9e9
+# Source0-md5: a83155a6e29e3988f07e5eea3287b21e
 Source1:       %{name}-daemon
 Source2:       %{name}-dnsconfd
 Source3:       %{name}.png
@@ -38,6 +37,7 @@ Patch0:               %{name}-desktop.patch
 Patch1:                %{name}-glade.patch
 Patch2:                %{name}-destdir.patch
 Patch3:                %{name}-mono-dir.patch
+Patch4:                nss-mdns-package.patch
 URL:           http://avahi.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -45,9 +45,11 @@ BuildRequires:       dbus-devel >= 0.92
 BuildRequires: doxygen
 BuildRequires: expat-devel
 BuildRequires: gdbm-devel
+BuildRequires: gettext-devel
 BuildRequires: glib2-devel >= 1:2.12.2
 BuildRequires: graphviz
 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
@@ -68,6 +70,7 @@ BuildRequires:        qt-devel >= 1:3.0
 BuildRequires: QtCore-devel
 BuildRequires: qt4-build
 %endif
+BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.228
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
@@ -379,8 +382,8 @@ Wiązania Avahi dla biblioteki Qt 4.
 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.
@@ -524,8 +527,10 @@ Narzędzia linii poleceń korzystające z avahi-client.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I common
 %{__autoconf}
@@ -549,8 +554,8 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},/etc/rc.d/init.d}
        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}
 
 ln -sf %{_includedir}/avahi-compat-libdns_sd/dns_sd.h \
        $RPM_BUILD_ROOT%{_includedir}/dns_sd.h
@@ -633,7 +638,7 @@ fi
 %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/*
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 
 %attr(755,root,root) %{_bindir}/avahi-set-host-name
 
@@ -670,7 +675,7 @@ fi
 %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.5
+%attr(755,root,root) %ghost %{_libdir}/libavahi-core.so.6
 # common for -discover*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/interfaces