- added macro use_gtk_doc; added missing BuildRequires on gtk-doc; enabled

gtk-doc generation on all platforms (had been disabled on ia64)

evolution-data-server.spec

@@ -14,6 +14,8 @@ ExcludeArch: ppc64
 
 %define eds_major 1.2
 
+%define use_gtk_doc 1
+
 %if %{use_mozilla_nss}
 %define mozilla_version 1.7.5
 %endif
@@ -21,7 +23,7 @@ ExcludeArch: ppc64
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.1.6
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -63,6 +65,10 @@ BuildRequires: mozilla-nss-devel >= 37:%{mozilla_version}
 %else
 BuildRequires: openssl-devel
 %endif
+%if %{use_gtk_doc}
+BuildRequires: gtk-doc
+%endif
+
 
 %if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11 
@@ -150,10 +156,10 @@ if pkg-config openssl ; then
 fi
 %endif
 
-%ifarch ia64
+%if %{use_gtk_doc}
-%define gtkdoc_flags --enable-gtk-doc=no
-%else
 %define gtkdoc_flags --enable-gtk-doc
+%else
+%define gtkdoc_flags --enable-gtk-doc=no
 %endif
 
 %configure \
@@ -203,6 +209,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar  1 2005 David Malcolm <dmalcolm@redhat.com> - 1.1.6-4
+- added macro use_gtk_doc; added missing BuildRequires on gtk-doc; enabled gtk-doc generation on all platforms (had been disabled on ia64)
+
 * Tue Mar  1 2005 David Malcolm <dmalcolm@redhat.com> - 1.1.6-3
 - extended patch to deal with camel-groupwise-store-summary.c