From 0b1041d5a2f15e26067171d1e1ab1e7c9bda36f9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 15 May 2006 09:01:45 +0000 Subject: [PATCH] - separated qt3/qt4 bconds (from AC-branch), qt bcond disables both Changed files: avahi.spec -> 1.46 --- avahi.spec | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/avahi.spec b/avahi.spec index 718518f..a504bf9 100644 --- a/avahi.spec +++ b/avahi.spec @@ -1,8 +1,14 @@ # # 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 %{without qt} +%undefine with_qt3 +%undefine with_qt4 +%endif %include /usr/lib/rpm/macros.mono # Summary: Free mDNS/DNS-SD implementation @@ -40,9 +46,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 @@ -397,7 +405,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 +591,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 +606,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.*.*.* -- 2.44.0