SPECS (AC-branch): avahi.spec - rel 2 - separate bconds for qt3 an...

[baggins]

Author: baggins                      Date: Sun May 14 23:07:56 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- rel 2
- separate bconds for qt3 and qt4

---- Files affected:
SPECS:
   avahi.spec (1.45.2.1 -> 1.45.2.2) 

---- Diffs:

================================================================
Index: SPECS/avahi.spec
diff -u SPECS/avahi.spec:1.45.2.1 SPECS/avahi.spec:1.45.2.2
--- SPECS/avahi.spec:1.45.2.1	Mon May 15 00:59:31 2006
+++ SPECS/avahi.spec	Mon May 15 01:07:51 2006
@@ -2,7 +2,8 @@
 #
 # 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
 #
@@ -10,7 +11,7 @@
 Summary(pl):	Wolna implementacja mDNS/DNS-SD
 Name:		avahi
 Version:	0.6.10
-Release:	1
+Release:	2
 License:	GPL v.2/LGPL
 Group:		Applications
 Source0:	http://avahi.org/download/%{name}-%{version}.tar.gz
@@ -41,9 +42,11 @@
 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
@@ -398,7 +401,8 @@
 	--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}
@@ -583,7 +587,7 @@
 %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.*.*.*
@@ -598,7 +602,9 @@
 %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.*.*.*
@@ -648,6 +654,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45.2.2  2006/05/14 23:07:51  baggins
+- rel 2
+- separate bconds for qt3 and qt4
+
 Revision 1.45.2.1  2006/05/14 22:59:31  baggins
 - merged from HEAD
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/avahi.spec?r1=1.45.2.1&r2=1.45.2.2&f=u