rpms/tidy/devel tidy.spec,1.10,1.11

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/tidy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27075

Modified Files:
	tidy.spec 
Log Message:
* Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-6.20050803
- cleanup doc generation
- add/restore missing docs (manpage, quickref.html)



Index: tidy.spec
===================================================================
RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- tidy.spec	8 Aug 2005 18:20:35 -0000	1.10
+++ tidy.spec	9 Aug 2005 12:53:32 -0000	1.11
@@ -2,7 +2,7 @@
 Name:    tidy
 Summary: Utility to clean up and pretty print HTML/XHTML/XML
 Version: 0.99.0
-Release: 5.20050803%{?dist}
+Release: 6.20050803%{?dist}
 
 Group:   Applications/Text
 License: W3C Software License
@@ -12,10 +12,12 @@
 Source0: http://tidy.sourceforge.net/src/tidy_src_050803.tgz
 # When next snapshot is released, to become:
 #Source0: http://tidy.sourceforge.net/src/old/tidy_src_050803.tgz
+
 Source1: http://tidy.sourceforge.net/docs/tidy_docs_050705.tgz
 
 BuildRequires: libtool
 BuildRequires: doxygen
+BuildRequires: libxslt
 
 Obsoletes: libtidy < %{version}-%{release}
 #Provides:  libtidy = %{epoch}:%{version}-%{release}
@@ -44,8 +46,6 @@
 %setup -q -n %{name}
 
 %setup -q -n %{name} -T -D -b1
-rm -rf htmldoc/api
-mv htmldoc/doxygen.cfg Doxyfile
 
 sh build/gnuauto/setup.sh
 
@@ -56,17 +56,25 @@
   --disable-dependancy-tracking
 
 make %{?_smp_mflags}
-doxygen
+
+# api docs 
+doxygen htmldoc/doxygen.cfg
+
+# make doc steps gleaned from build/gmake/Makefile
+pushd htmldoc
+../console/tidy -xml-config > tidy-config.xml
+../console/tidy -xml-help   > tidy-help.xml
+xsltproc -o tidy.1 tidy1.xsl tidy-help.xml 
+xsltproc -o quickref.html quickref-html.xsl tidy-config.xml 
+popd
 
 
 %install
-rm -rf $RPM_BUILD_ROOT _api
+rm -rf $RPM_BUILD_ROOT 
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-#install -D -p -m644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
-
-mv htmldoc/api _api
+install -D -p -m644 htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
 
 ## Unpackaged files
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
@@ -83,20 +91,24 @@
 
 %files
 %defattr(-,root,root,-)
-%doc htmldoc/*
+%doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif
 %{_bindir}/*
-#{_mandir}/man1/*
+%{_mandir}/man1/*
 %{_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%doc _api/*
+%doc htmldoc/api/*
 %{_includedir}/*
 %{_libdir}/lib*.so
 
 
 %changelog
-* Mon Aug  8 2005 Rex Dieter <rexdieter at sf.net> 0.99.0-5.20050803
+* Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-6.20050803
+- cleanup doc generation
+- add/restore missing docs (manpage, quickref.html)
+
+* Mon Aug  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-5.20050803
 - Update to 050803 and docs to 050705
 - simplify (fedora.us bug #2071)
 - drop missing manpage