- use users/groups available in PLD (do we need a separate avahi-autoipd user? I...

[packages/avahi.git] / avahi.spec

diff --git a/avahi.spec b/avahi.spec
index 0aa2193b452e02d0755bb5b1f56a573cf9881edd..ea4b2a56896cc2d1c5ee77738be5516ba7eb7e45 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,17 +15,17 @@
 %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.25
-Release:       2
+Release:       4
 License:       LGPL v2.1+
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -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
@@ -57,7 +57,7 @@ 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 >= 1:2.4
@@ -433,7 +433,7 @@ Summary:    Development files for MONO Avahi bindings
 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.
@@ -459,7 +459,7 @@ 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
+Requires:      monodoc >= 2.6
 
 %description -n dotnet-avahi-ui-devel
 Development files for MONO Avahi UI bindings.
@@ -527,6 +527,7 @@ Narzędzia linii poleceń korzystające z avahi-client.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__intltoolize}
@@ -542,7 +543,10 @@ Narzędzia linii poleceń korzystające z avahi-client.
        %{!?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
@@ -553,8 +557,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
@@ -769,7 +773,7 @@ fi
 %files -n dotnet-avahi-devel
 %defattr(644,root,root,755)
 %{_prefix}/lib/mono/avahi-sharp
-%{_libdir}/monodoc/sources/avahi-sharp-docs.*
+%{_prefix}/lib/monodoc/sources/avahi-sharp-docs.*
 %{_pkgconfigdir}/avahi-sharp.pc
 
 %files -n dotnet-avahi-ui
@@ -779,7 +783,7 @@ fi
 %files -n dotnet-avahi-ui-devel
 %defattr(644,root,root,755)
 %{_prefix}/lib/mono/avahi-ui-sharp
-%{_libdir}/monodoc/sources/avahi-ui-sharp-docs.*
+%{_prefix}/lib/monodoc/sources/avahi-ui-sharp-docs.*
 %{_pkgconfigdir}/avahi-ui-sharp.pc
 %endif