- rel 2

[packages/avahi.git] / avahi.spec

diff --git a/avahi.spec b/avahi.spec
index 316270e4b6ae33155af2fe7c4465c083a4f3d883..aae068af2b72150e081e419ff232efebf4544e25 100644 (file)
--- a/avahi.spec
+++ b/avahi.spec
@@ -1,19 +1,20 @@
 #
 # Conditional build:
 %bcond_without dotnet          # build with dotnet bindings
-%bcond_without qt              # build with qt bindings
+%bcond_without qt3             # build with qt3 bindings
+%bcond_with    qt4             # build with qt4 bindings
 #
 %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:       5
+Version:       0.6.10
+Release:       2
 License:       GPL v.2/LGPL
 Group:         Applications
 Source0:       http://avahi.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 2652910f0e52c373d7a15b6851750517
+# Source0-md5: cfb9e05c138dff4c430a35eee6229e8a
 Source1:       %{name}-daemon
 Source2:       %{name}-dnsconfd
 Source3:       %{name}.png
@@ -40,9 +41,11 @@ BuildRequires:       monodoc
 BuildRequires: pkgconfig
 BuildRequires: python-dbus
 BuildRequires: python-pygtk-devel
-%if %{with qt}
-BuildRequires: QtCore-devel
+%if %{with qt3}
 BuildRequires: qt-devel >= 3.0
+%endif
+%if %{with qt4}
+BuildRequires: QtCore-devel
 BuildRequires: qt4-build
 %endif
 BuildRequires: rpmbuild(macros) >= 1.228
@@ -343,9 +346,9 @@ je jako odno
 Summary:       Avahi Zeroconf browser
 Summary(pl):   Przegl±darka Zeroconf Avahi
 Group:         Applications
-Requires: avahi
-Requires: python-dbus
-Requires: python-pygtk-glade
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-dbus
+Requires:      python-pygtk-glade
 
 %description discover
 A tool for enumerating all available services on the local LAN
@@ -359,9 +362,9 @@ Narz
 Summary:       Avahi Zeroconf browser
 Summary(pl):   Przegl±darka Zeroconf Avahi
 Group:         Applications
-Requires: avahi
-Requires: python-dbus
-Requires: python-pygtk-glade
+Requires:      %{name} = %{version}-%{release}
+Requires:      python-dbus
+Requires:      python-pygtk-glade
 
 %description discover-standalone
 GTK+ tool for enumerating all available services on the local LAN.
@@ -397,7 +400,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}
@@ -582,7 +586,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.*.*.*
@@ -597,7 +601,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.*.*.*