- Remove the use_gtk_doc macro.

- Remove redundant requirements.
- Use the name tag where appropriate.
- Add an evolution-data-server-doc subpackage.

evolution-data-server.spec

@@ -13,7 +13,6 @@
 %define eds_base_version 1.12
 %define eds_api_version 1.2
 
-%define use_gtk_doc 0
 %define use_gnome_keyring 1
 %define support_imap4_provider 0
 
@@ -27,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.12.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -68,18 +67,6 @@ Patch18: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
 # RH bug #243296
 Patch19: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-### Dependencies ###
-
-Requires: GConf2
-Requires: ORBit2 >= %{orbit2_version}
-Requires: db4
-Requires: glib2 >= %{glib2_version}
-Requires: gnome-vfs2
-Requires: libbonobo >= %{libbonobo_version}
-Requires: libglade2
-Requires: libgnomeui
-Requires: libsoup >= %{soup_version}
-
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -91,6 +78,7 @@ BuildRequires: gettext
 BuildRequires: glib2-devel
 BuildRequires: gnome-vfs2-devel
 BuildRequires: gnutls-devel
+BuildRequires: gtk-doc
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libglade2-devel
@@ -106,10 +94,6 @@ BuildRequires: nss-devel
 BuildRequires: openssl-devel
 %endif
 
-%if %{use_gtk_doc}
-BuildRequires: gtk-doc
-%endif
-
 %if %{ldap_support}
 %if %{static_ldap}
 BuildRequires: openldap-evolution-devel
@@ -127,23 +111,30 @@ BuildRequires: krb5-devel
 %endif
 
 %description
-The evolution-data-server package provides a unified backend for programs
+The %{name} package provides a unified backend for programs that work
-that work with contacts, tasks, and calendar information.
+with contacts, tasks, and calendar information.
 
 It was originally developed for Evolution (hence the name), but is now used
 by other packages.
 
 %package devel
-Summary: Development files for building against evolution-data-server
+Summary: Development files for building against %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-doc = %{version}-%{release}
 Requires: libbonobo-devel
 Requires: libgnome-devel
 Requires: libsoup-devel
 
 %description devel
-Development files needed for building things which link against 
+Development files needed for building things which link against %{name}.
-evolution-data-server.
+
+%package doc
+Summary: Documentation files for %{name}
+Group: Development/Libraries
+
+%description doc
+This package contains developer documentation for %{name}.
 
 %prep
 %setup -q
@@ -229,12 +220,6 @@ if pkg-config openssl ; then
 fi
 %endif
 
-%if %{use_gtk_doc}
-%define gtkdoc_flags --enable-gtk-doc
-%else
-%define gtkdoc_flags --enable-gtk-doc=no
-%endif
-
 # Add stricter build settings here as the source code gets cleaned up.
 # We want to make sure things like compiler warnings and avoiding deprecated
 # functions in the GNOME/GTK+ libraries stay fixed.
@@ -268,6 +253,7 @@ autoconf
 	--with-libdb=/usr \
 	--enable-file-locking=fcntl \
 	--enable-dot-locking=no \
+	--enable-gtk-doc \
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \
 	%keyring_flags
 export tagname=CC
@@ -366,7 +352,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/evolution-data-server-%{eds_base_version}
-%{_datadir}/gtk-doc/html/*
 %{_libdir}/libcamel-%{eds_api_version}.so
 %{_libdir}/libcamel-provider-%{eds_api_version}.so
 %{_libdir}/libebook-%{eds_api_version}.so
@@ -389,7 +374,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
+%files doc
+%defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/camel
+%{_datadir}/gtk-doc/html/libebook
+%{_datadir}/gtk-doc/html/libecal
+%{_datadir}/gtk-doc/html/libedata-book
+%{_datadir}/gtk-doc/html/libedata-cal
+%{_datadir}/gtk-doc/html/libedataserver
+%{_datadir}/gtk-doc/html/libedataserverui
+
 %changelog
+* Fri Oct 26 2007 Matthew Barnes <mbarnes@redhat.com> - 1.12.1-4.fc9
+- Remove the use_gtk_doc macro.
+- Remove redundant requirements.
+- Use the name tag where appropriate.
+- Add an evolution-data-server-doc subpackage.
+
 * Thu Oct 18 2007 Matthew Barnes <mbarnes@redhat.com> - 1.12.1-3.fc9
 - Porting a couple patches over from RHEL5:
 - Add patch for RH bug #212106 (address book error on fresh install).