SPECS: dbus-glib.spec - BR: gettext-devel, gtk-doc-automake - without apido...

charles charles at pld-linux.org
Sat Sep 13 19:05:38 CEST 2008


Author: charles                      Date: Sat Sep 13 17:05:38 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: gettext-devel, gtk-doc-automake
- without apidocs bcond

---- Files affected:
SPECS:
   dbus-glib.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/dbus-glib.spec
diff -u SPECS/dbus-glib.spec:1.14 SPECS/dbus-glib.spec:1.15
--- SPECS/dbus-glib.spec:1.14	Tue Jun 17 14:00:03 2008
+++ SPECS/dbus-glib.spec	Sat Sep 13 19:05:32 2008
@@ -1,5 +1,8 @@
 # $Revision$, $Date$
 #
+# Conditional build:
+%bcond_without	apidocs         # disable gtk-doc
+#
 %define		dbus_version	0.93
 %define		expat_version	1:1.95.5
 %define		glib_version	1:2.10.1
@@ -21,7 +24,9 @@
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-devel >= %{dbus_version}
 BuildRequires:	expat-devel >= %{expat_version}
+BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= %{glib_version}
+%{?with_apidocs:BuildRequires:	gtk-doc-automake >= 1.8}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.98
@@ -79,6 +84,11 @@
 %patch0 -p1
 %patch1 -p1
 
+%if !%{with apidocs}
+echo 'EXTRA_DIST=' > gtk-doc.make
+echo 'AC_DEFUN([GTK_DOC_CHECK],[])' >> acinclude.m4
+%endif
+
 %build
 %{__libtoolize}
 %{__aclocal}
@@ -86,7 +96,8 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-html-dir=%{_gtkdocdir} \
+	%{!?with_apidocs:--disable-gtk-doc} \
+	%{?with_apidocs:--with-html-dir=%{_gtkdocdir}} \
 	--with-xml=expat
 
 cp %{SOURCE1} tools
@@ -125,9 +136,11 @@
 %defattr(644,root,root,755)
 %{_libdir}/libdbus-glib-1.a
 
+%if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %{_gtkdocdir}/dbus-glib
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -135,6 +148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2008/09/13 17:05:32  charles
+- BR: gettext-devel, gtk-doc-automake
+- without apidocs bcond
+
 Revision 1.14  2008/06/17 12:00:03  patrys
 - 0.76
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/dbus-glib.spec?r1=1.14&r2=1.15&f=u



More information about the pld-cvs-commit mailing list