packages: avahi/avahi.spec - without gtk and without pygtk bconds for GUI-f...

[jajcus]

Author: jajcus                       Date: Fri Jun 11 11:43:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- without gtk and without pygtk bconds for GUI-free builds
- BR: graphviz back, now in the 'apidocs' bcond (it was require for API
  documentation build, but that documentation were never packaged)

---- Files affected:
packages/avahi:
   avahi.spec (1.113 -> 1.114) 

---- Diffs:

================================================================
Index: packages/avahi/avahi.spec
diff -u packages/avahi/avahi.spec:1.113 packages/avahi/avahi.spec:1.114
--- packages/avahi/avahi.spec:1.113	Fri Jun 11 13:09:49 2010
+++ packages/avahi/avahi.spec	Fri Jun 11 13:43:28 2010
@@ -1,7 +1,13 @@
 # $Revision$, $Date$
 #
+# TODO:
+#	- finish with_apidocs
+#
 # Conditional build:
+%bcond_with	apidocs		# build API documentation
 %bcond_without	dotnet		# build without dotnet bindings
+%bcond_without	gtk		# build without GTK+
+%bcond_without	pygtk		# build without PyGTK
 %bcond_without	qt		# build without (any) qt bindings
 %bcond_without	qt3		# build without qt3 bindings
 %bcond_without	qt4		# build without qt4 bindings
@@ -44,16 +50,22 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dbus-devel >= 0.92
+%if %{with apidocs}
 BuildRequires:	doxygen
+# for the 'dot' tool used by doxygen
+BuildRequires:	graphviz
+%endif
 BuildRequires:	expat-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	gettext-devel
+%if %{with gtk}
 BuildRequires:	glib2-devel >= 1:2.12.2
 BuildRequires:	gtk+2-devel >= 2:2.10.2
+BuildRequires:	libglade2-devel >= 1:2.6.0
+%endif
 BuildRequires:	intltool >= 0.35
 BuildRequires:	libcap-devel
 BuildRequires:	libdaemon-devel >= 0.11
-BuildRequires:	libglade2-devel >= 1:2.6.0
 BuildRequires:	libtool
 %if %{with dotnet}
 BuildRequires:	dotnet-gtk-sharp2-devel >= 2.10
@@ -63,7 +75,7 @@
 BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.4
 BuildRequires:	python-dbus >= 0.71
-BuildRequires:	python-pygtk-devel >= 2:2.9.6
+%{?with_pygtk:BuildRequires:	python-pygtk-devel >= 2:2.9.6}
 %if %{with qt3}
 BuildRequires:	qt-devel >= 1:3.0
 %endif
@@ -588,6 +600,9 @@
 	--enable-compat-libdns_sd \
 	--enable-compat-howl \
 	--with-distro=none \
+	%{!?with_apidocs:--disable-doxygen-doc} \
+	%{!?with_gtk:--disable-gtk} \
+	%{!?with_pygtk:--disable-pygtk} \
 	%{!?with_qt3:--disable-qt3} \
 	%{!?with_qt4:--disable-qt4} \
 	%{!?with_dotnet:--disable-mono} \
@@ -785,6 +800,7 @@
 %{_libdir}/libavahi-common.a
 %{_libdir}/libavahi-core.a
 
+%if %{with gtk}
 %files ui
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bshell
@@ -807,6 +823,7 @@
 %files ui-static
 %defattr(644,root,root,755)
 %{_libdir}/libavahi-ui.a
+%endif
 
 %files compat-libdns_sd
 %defattr(644,root,root,755)
@@ -941,6 +958,7 @@
 %attr(755,root,root) %{_bindir}/avahi-bookmarks
 %{_mandir}/man1/avahi-bookmarks.1*
 
+%if %{with pygtk}
 %files discover
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-discover
@@ -949,11 +967,14 @@
 %{_desktopdir}/avahi-discover.desktop
 %{_pixmapsdir}/avahi.png
 %{_mandir}/man1/avahi-discover.1*
+%endif
 
+%if %{with gtk}
 %files discover-standalone
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/avahi-discover-standalone
 %{_datadir}/%{name}/interfaces/avahi-discover-standalone.glade
+%endif
 
 %files utils
 %defattr(644,root,root,755)
@@ -980,6 +1001,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2010/06/11 11:43:28  jajcus
+- without gtk and without pygtk bconds for GUI-free builds
+- BR: graphviz back, now in the 'apidocs' bcond (it was require for API
+  documentation build, but that documentation were never packaged)
+
 Revision 1.113  2010/06/11 11:09:49  jajcus
 - BR: graphviz (not referenced anywhere in the sources and Avahi compiles without it)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avahi/avahi.spec?r1=1.113&r2=1.114&f=u