--- a/ChangeLog	Thu Jul 31 10:58:27 2008 +0000
+++ b/ChangeLog	Thu Jul 31 12:35:04 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-31 Jeff Cai <[email protected]> 
+
+	* SUNWgnutls.spec:Move man pages from devel package to the main package.
+	* SUNWlibgcrypt.spec:Build man pages.
+
 2008-07-31  Matt Keenan <[email protected]>
 
     * SUNWgnome-config.spec: Update Owner Comment, to confirm with all other

--- a/SUNWgnutls.spec	Thu Jul 31 10:58:27 2008 +0000
+++ b/SUNWgnutls.spec	Thu Jul 31 12:35:04 2008 +0000
@@ -130,6 +130,14 @@
 %{_libdir}/%{_arch64}/lib*.so*
 %endif
 
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+%dir %attr(0755, root, bin) %{_mandir}/man3
+%{_mandir}/man3/*
+
+
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -147,13 +155,6 @@
 %dir %attr (0755, root, other) %{_datadir}/aclocal
 %{_datadir}/aclocal/*
 
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man1
-%{_mandir}/man1/*
-%dir %attr(0755, root, bin) %{_mandir}/man3
-%{_mandir}/man3/*
-
-
 #FIXME: l10n build fails on nevada
 %if %build_l10n
 %files l10n

--- a/SUNWlibgcrypt.spec	Thu Jul 31 10:58:27 2008 +0000
+++ b/SUNWlibgcrypt.spec	Thu Jul 31 12:35:04 2008 +0000
@@ -29,6 +29,8 @@
 Requires: SUNWlibgpg-error
 BuildRequires: SUNWlibgpg-error-devel
 
+Source1:    %{name}-manpages-0.1.tar.gz
+
 %package devel
 Summary:       %{summary} - development files
 SUNW_BaseDir:  %{_basedir}
@@ -46,6 +48,11 @@
 mkdir -p %name-%version/%base_arch
 %libgcrypt.prep -d %name-%version/%base_arch
 
+# Expand manpages tarball
+cd %{_builddir}/%name-%version
+gzcat %SOURCE1 | tar xf -
+
+
 %build
 %ifarch amd64 sparcv9
 %libgcrypt64.build -d %name-%version/%_arch64
@@ -64,6 +71,9 @@
 rm -r $RPM_BUILD_ROOT%{_datadir}/info
 rm -r $RPM_BUILD_ROOT%{_sbindir}
 
+cd %{_builddir}/%name-%version/sun-manpages
+make install DESTDIR=$RPM_BUILD_ROOT
+
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
 %clean
@@ -77,6 +87,13 @@
 %{_libdir}/%{_arch64}
 %endif
 
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+%dir %attr(0755, root, bin) %{_mandir}/man3
+%{_mandir}/man3/*
+
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
@@ -88,6 +105,8 @@
 %{_datadir}/aclocal/*
 
 %changelog
+* Thu Jul 31 2008 - [email protected]
+- Add man pages for libgcrypt.
 * Fri Jun 06 2008 - [email protected]
 - Change 'rm -rf' to 'rm -r' so that changes to installed dirs will be noticed
   in build logs.