rpms/tidy/EL-4 tidy-cvs_checkout.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 tidy.spec, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/tidy/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25229

Modified Files:
	.cvsignore sources tidy.spec 
Added Files:
	tidy-cvs_checkout.sh 
Log Message:
* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.99.0-13.20070615
- 2007-06-15 snapshot



--- NEW FILE tidy-cvs_checkout.sh ---
#!/bin/bash

if [ $# -gt 0 ]; then  
  DATE=$1
  shift
else
  DATE=$(date +%Y%m%d)
fi

MODULE="$(basename $0 -cvs_checkout.sh)"

set -x
rm -rf $MODULE

cvs -z3 -d:pserver:anonymous at tidy.cvs.sourceforge.net:/cvsroot/tidy export -D $DATE $MODULE 

## tar it up
tar czf $MODULE-${DATE}cvs.tar.gz $MODULE

## cleanup
rm -rf $MODULE



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/EL-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Dec 2004 19:22:39 -0000	1.5
+++ .cvsignore	31 Jul 2007 12:25:09 -0000	1.6
@@ -1,2 +1,4 @@
-tidy_docs_041206.tgz
-tidy_src_041214.tgz
+tidy_src_051025.tgz
+tidy_docs_051020.tgz
+tidy-20070228cvs.tar.gz
+tidy-20070615cvs.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/EL-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Dec 2004 19:22:39 -0000	1.5
+++ sources	31 Jul 2007 12:25:09 -0000	1.6
@@ -1,2 +1 @@
-4ac92cbb22d86ae1a42c3d56b6c3f424  tidy_docs_041206.tgz
-dc87c8acba1e71690c5104911aee6ed7  tidy_src_041214.tgz
+1a2058632249d6005c5205d5caa0dd5f  tidy-20070615cvs.tar.gz


Index: tidy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tidy/EL-4/tidy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tidy.spec	17 Dec 2004 19:22:39 -0000	1.6
+++ tidy.spec	31 Jul 2007 12:25:09 -0000	1.7
@@ -1,17 +1,25 @@
-Name:           tidy
-Version:        0.99.0
-Release:        2.20041214
-Epoch:          0
-Summary:        Utility to clean up and pretty print HTML/XHTML/XML
-
-Group:          Applications/Text
-License:        W3C Software License
-URL:            http://tidy.sourceforge.net/
-Source0:        http://tidy.sourceforge.net/src/tidy_src_041214.tgz
-Source1:        http://tidy.sourceforge.net/docs/tidy_docs_041206.tgz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libtool, doxygen
+%define libname libtidy
+
+%define snap 20070615 
+
+Name:    tidy
+Summary: Utility to clean up and pretty print HTML/XHTML/XML
+Version: 0.99.0
+Release: 13.%{snap}%{?dist}
+
+Group:   Applications/Text
+License: W3C Software License
+URL:     http://tidy.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# timestamp 01-Feb-2007
+Source0: tidy-%{snap}cvs.tar.gz
+Source10: tidy-cvs_checkout.sh 
+
+#BuildRequires: libtool
+BuildRequires: doxygen
+BuildRequires: libxslt
 
 %description
 When editing HTML it's easy to make mistakes. Wouldn't it be nice if
@@ -23,73 +31,127 @@
 identify where you need to pay further attention on making your pages
 more accessible to people with disabilities.
 
-%package     -n lib%{name}
-Summary:        Shared libraries for tidy
-Group:          System Environment/Libraries
-
-%description -n lib%{name}
+%package -n %{libname} 
+Summary: Shared libraries for tidy
+Group:	 System Environment/Libraries
+%description -n %{libname} 
 %{summary}.
 
-%package     -n lib%{name}-devel
-Summary:        Development files for tidy
-Group:          Development/Libraries
-Requires:       lib%{name} = %{epoch}:%{version}-%{release}
-
-%description -n lib%{name}-devel
+%package -n %{libname}-devel
+Summary: Development files for libtidy 
+Group:   Development/Libraries
+Obsoletes: tidy-devel < %{version}-%{release}
+Provides:  tidy-devel = %{version}-%{release}
+Requires: %{libname} = %{version}-%{release}
+%description -n %{libname}-devel
 %{summary}.
 
 
 %prep
 %setup -q -n %{name}
-%setup -q -n %{name} -T -D -b1
-rm -rf htmldoc/api
-mv htmldoc/doxygen.cfg Doxyfile
 
+# htmldocs included in cvs checkout
+#setup -q -n %{name} -T -D -b1
 
-%build
 sh build/gnuauto/setup.sh
-%configure --disable-dependency-tracking
+
+
+%build
+%configure \
+  --disable-static \
+  --disable-dependency-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 DESTDIR=$RPM_BUILD_ROOT
-install -Dpm 644 htmldoc/man_page.txt $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
-mv htmldoc/api _api
+
+install -p -m644 -D htmldoc/tidy.1 $RPM_BUILD_ROOT%{_mandir}/man1/tidy.1
+
+## Unpackaged files
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -n lib%{name} -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
 
-%postun -n lib%{name} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
 
 
 %files
 %defattr(-,root,root,-)
-%doc htmldoc/*
-%{_bindir}/tidy
-%{_bindir}/tab2space
-%{_mandir}/man1/tidy.1*
+%doc htmldoc/*.html htmldoc/*.css htmldoc/*.gif
+%{_bindir}/*
+%{_mandir}/man1/*
 
-%files -n lib%{name}
+%files -n %{libname} 
 %defattr(-,root,root,-)
-%{_libdir}/libtidy*.so.*
+%{_libdir}/lib*.so.*
 
-%files -n lib%{name}-devel
+%files -n %{libname}-devel
 %defattr(-,root,root,-)
-%doc _api/*
-%{_includedir}/*.h
-%{_libdir}/libtidy.so
-%{_libdir}/libtidy.a
-%exclude %{_libdir}/libtidy.la
+%doc htmldoc/api/*
+%{_includedir}/*
+%{_libdir}/lib*.so
 
 
 %changelog
+* Mon Jul 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.99.0-13.20070615
+- 2007-06-15 snapshot
+
+* Wed Feb 28 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.99.0-12.20070228
+- 2007-02-28 snapshot
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-11.20051025
+- fc6 respin
+
+* Wed Jul 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-10.20051025
+- fc6 respin
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
+* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-9.20051025
+- libtidy returns to be multilib friendly
+
+* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-8.20051025
+- Update to 051025 and docs to 051020
+
+* Tue Aug  9 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.99.0-7.20050803
+- -devel: Provides: libtidy-devel (#165452)
+
+* 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 
+
+* Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.99.0-4.20041214
+- rebuild on all arches
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt       
+
 * Thu Dec 16 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.99.0-2.20041214
 - Update to 041214 and docs to 041206.
 - Build with dependency tracking disabled.