Author: qboosh Date: Mon May 15 09:01:50 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separated qt3/qt4 bconds (from AC-branch), qt bcond disables both
---- Files affected:
SPECS:
avahi.spec (1.45 -> 1.46)
---- Diffs:
================================================================
Index: SPECS/avahi.spec
diff -u SPECS/avahi.spec:1.45 SPECS/avahi.spec:1.46
--- SPECS/avahi.spec:1.45 Sat May 6 06:32:40 2006
+++ SPECS/avahi.spec Mon May 15 11:01:45 2006
@@ -1,9 +1,15 @@
# $Revision$, $Date$
#
# 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
@@ -41,9 +47,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 +406,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 +592,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 +607,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 +659,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.46 2006/05/15 09:01:45 qboosh
+- separated qt3/qt4 bconds (from AC-branch), qt bcond disables both
+
Revision 1.45 2006/05/06 04:32:40 aredridel
- up to 0.6.10
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/avahi.spec?r1=1.45&r2=1.46&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
