# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1239394214 25200
# Node ID 3b04745ff76da97c2bdae0489537657c4da64d16
# Parent  265c7a65b75b9a77e5a6c7d0929858974accae49
prep for fedora build

diff -r 265c7a65b75b -r 3b04745ff76d ChangeLog
--- a/ChangeLog	Fri Apr 10 12:00:46 2009 -0700
+++ b/ChangeLog	Fri Apr 10 13:10:14 2009 -0700
@@ -1,4 +1,4 @@
-LibPST 0.6.36 (2009-04-09)
+LibPST 0.6.36 (2009-04-10)
 ===============================
     * spec file cleanup with multiple sub packages.
     * add doxygen devel-doc documentation for the shared library.
diff -r 265c7a65b75b -r 3b04745ff76d Makefile.cvs
--- a/Makefile.cvs	Fri Apr 10 12:00:46 2009 -0700
+++ b/Makefile.cvs	Fri Apr 10 13:10:14 2009 -0700
@@ -8,7 +8,6 @@
 	autoheader
 	automake
 	autoconf
-	./configure --enable-libpst-shared >/dev/null
-	#rm -rf html.internal
-	#doxygen
-	#tar cfz libpst.html.tar.gz html.internal
+	rm -rf html.internal
+	doxygen
+	tar cfz libpst.html.tar.gz html.internal
diff -r 265c7a65b75b -r 3b04745ff76d NEWS
--- a/NEWS	Fri Apr 10 12:00:46 2009 -0700
+++ b/NEWS	Fri Apr 10 13:10:14 2009 -0700
@@ -1,4 +1,4 @@
-0.6.36  2009-04-09 remove fully versioned -libs dependency from main package
+0.6.36  2009-04-10 build separate -doc and -devel-doc subpackages
 0.6.35  2009-04-08 properly add trailing mime boundary in all modes, build separate rpms with libpst.so shared.
 0.6.34  2009-03-19 avoid putting mixed item types into the same output folder
 0.6.33  2009-03-17 fix utf-7 conversions, don't produce empty attachment files in separate mode
diff -r 265c7a65b75b -r 3b04745ff76d README
--- a/README	Fri Apr 10 12:00:46 2009 -0700
+++ b/README	Fri Apr 10 13:10:14 2009 -0700
@@ -9,6 +9,7 @@
 Starting with a mercurial working directory, try this:
 
     make -f *cvs
+    ./configure
     (cd xml; make; make distclean)
     make distcheck
 
diff -r 265c7a65b75b -r 3b04745ff76d html/Makefile.am
--- a/html/Makefile.am	Fri Apr 10 12:00:46 2009 -0700
+++ b/html/Makefile.am	Fri Apr 10 13:10:14 2009 -0700
@@ -1,3 +1,5 @@
-htmldir = ${datadir}/doc/@PACKAGE@-@VERSION@
-html_DATA = $(wildcard *.html) $(wildcard *.pdf) $(wildcard devel/*)
-EXTRA_DIST = $(html_DATA)
+htmldir        = ${datadir}/doc/@PACKAGE@-@VERSION@
+htmldeveldir   = ${datadir}/doc/@PACKAGE@-@VERSION@-devel
+html_DATA      = $(wildcard *.html) $(wildcard *.pdf)
+htmldevel_DATA = $(wildcard devel/*)
+EXTRA_DIST     = $(html_DATA) $(htmldevel_DATA)
diff -r 265c7a65b75b -r 3b04745ff76d libpst.spec.in
--- a/libpst.spec.in	Fri Apr 10 12:00:46 2009 -0700
+++ b/libpst.spec.in	Fri Apr 10 13:10:14 2009 -0700
@@ -44,7 +44,6 @@
 %package devel-doc
 Summary:            Documentation for libpst.so for libpst application development
 Group:              Documentation
-Requires:           %{name}-doc = %{version}-%{release}
 
 %description devel-doc
 The libpst-devel-doc package contains the doxygen generated
@@ -102,7 +101,7 @@
 
 %files devel-doc
 %defattr(-,root,root,-)
-%{_datadir}/doc/%{name}-%{version}/devel
+%{_datadir}/doc/%{name}-%{version}-devel/
 
 
 %files devel
@@ -119,9 +118,8 @@
 
 
 %changelog
-* Thu Apr 09 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.36-1
-- change to >= for -libs dependency from the main package.
-- add -doc subpackage.
+* Fri Apr 10 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.36-1
+- build separate -doc and -devel-doc subpackages.
 - other spec file cleanup
 
 * Wed Apr 08 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.35-1