- switch to successor project (tidy-html5), updated to 5.6.0 (new soname; 0.99 left...

- removed outdated format-security patch
- headers moved to tidy subdir (which is more flexible and expected by most projects utilizing libtidy)

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644 (file)
index 5fad477..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/src/localize.c
-+++ b/src/localize.c
-@@ -1373,14 +1373,14 @@ void TY_(ReportAccessWarning)( TidyDocImpl* doc, Node* node, uint code )
- {
-     ctmbstr fmt = GetFormatFromCode(code);
-     doc->badAccess |= BA_WAI;
--    messageNode( doc, TidyAccess, node, fmt );
-+    messageNode( doc, TidyAccess, node, "%s", fmt );
- }
- 
- void TY_(ReportAccessError)( TidyDocImpl* doc, Node* node, uint code )
- {
-     ctmbstr fmt = GetFormatFromCode(code);
-     doc->badAccess |= BA_WAI;
--    messageNode( doc, TidyAccess, node, fmt );
-+    messageNode( doc, TidyAccess, node, "%s", fmt );
- }
- 
- #endif /* SUPPORT_ACCESSIBILITY_CHECKS */
-@@ -1399,7 +1399,7 @@ void TY_(ReportWarning)(TidyDocImpl* doc, Node *element, Node *node, uint code)
-     switch (code)
-     {
-     case NESTED_QUOTATION:
--        messageNode(doc, TidyWarning, rpt, fmt);
-+        messageNode(doc, TidyWarning, rpt, "%s", fmt);
-         break;
- 
-     case OBSOLETE_ELEMENT:
-@@ -1480,7 +1480,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
-     case INCONSISTENT_NAMESPACE:
-     case DOCTYPE_AFTER_TAGS:
-     case DTYPE_NOT_UPPER_CASE:
--        messageNode(doc, TidyWarning, rpt, fmt);
-+        messageNode(doc, TidyWarning, rpt, "%s", fmt);
-         break;
- 
-     case COERCE_TO_ENDTAG:
-@@ -1499,7 +1499,7 @@ void TY_(ReportError)(TidyDocImpl* doc, Node *element, Node *node, uint code)
-     case ENCODING_IO_CONFLICT:
-     case MISSING_DOCTYPE:
-     case SPACE_PRECEDING_XMLDECL:
--        messageNode(doc, TidyWarning, node, fmt);
-+        messageNode(doc, TidyWarning, node, "%s", fmt);
-         break;
- 
-     case TRIM_EMPTY_ELEMENT:
-@@ -1548,7 +1548,7 @@ void TY_(ReportFatal)( TidyDocImpl* doc, Node *element, Node *node, uint code)
-     {
-     case SUSPECTED_MISSING_QUOTE:
-     case DUPLICATE_FRAMESET:
--        messageNode(doc, TidyError, rpt, fmt);
-+        messageNode(doc, TidyError, rpt, "%s", fmt);
-         break;
- 
-     case UNKNOWN_ELEMENT:

diff --git a/tidy.spec b/tidy.spec
index 45ce86d343b1c81acfeaad858ab3b7fde3382082..a7430dce374e78f4f79da3e966bf1373690a93b2 100644 (file)
--- a/tidy.spec
+++ b/tidy.spec
@@ -1,24 +1,17 @@
-%define                _snap   20091119
 Summary:       Utility to clean up and pretty print HTML files
 Summary(pl.UTF-8):     Narzędzie do porządkowania kodu HTML
 Name:          tidy
-Version:       0.%{_snap}
-Release:       2
+Version:       5.6.0
+Release:       1
 Epoch:         1
 License:       distributable
 Group:         Applications/Text
-# tidy projects no longer releases tarballs.
-# cvs -z3 -d:pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy export -D 2009-11-19 tidy
-# tar -cf tidy-20091119.tar tidy;xz -9 -e tidy-20091119.tar
-Source0:       tidy-%{_snap}.tar.xz
-# Source0-md5: 0ca49cf79b4f3d25a080234a0bbf8eee
-Patch0:                format-security.patch
-URL:           http://tidy.sourceforge.net/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-BuildRequires: tar >= 1:1.22
-BuildRequires: xz
+#Source0Download: https://github.com/htacg/tidy-html5/releases
+Source0:       https://github.com/htacg/tidy-html5/archive/5.6.0/tidy-html5-%{version}.tar.gz
+# Source0-md5: 85c8a163d9ece6a02fe12bc9bddbc455
+URL:           http://www.html-tidy.org/
+BuildRequires: cmake >= 2.8.12
+BuildRequires: libxslt-progs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,20 +50,30 @@ Static Tidy library.
 Statyczna biblioteka Tidy.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n tidy-html5-%{version}
 
 %build
-sh build/gnuauto/setup.sh
-%configure
+install -d build
+cd build
+# .pc file template expects relative {INCLUDE,LIB}_INSTALL_DIR
+%cmake .. \
+       -DBUILD_TAB2SPACE=ON \
+       -DINCLUDE_INSTALL_DIR=include/tidy \
+       -DLIB_INSTALL_DIR=%{_lib} \
+       -DTIDY_COMPAT_HEADERS=ON \
+       -DTIDY_CONSOLE_SHARED=ON
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# not installed
+install build/tab2space $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,20 +82,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc htmldoc/*
+%doc README.md README/{API_AND_NAMESPACE.md,ATTRIBUTES.md,LICENSE.md,MESSAGES.md,OPTIONS.md,TAGS.md}
 %attr(755,root,root) %{_bindir}/tab2space
 %attr(755,root,root) %{_bindir}/tidy
-%attr(755,root,root) %{_libdir}/libtidy-0.99.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libtidy-0.99.so.0
+%attr(755,root,root) %{_libdir}/libtidy.so.%{version}
+%attr(755,root,root) %ghost %{_libdir}/libtidy.so.5
+%{_mandir}/man1/tidy.1*
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtidy.so
-%{_libdir}/libtidy.la
-%{_includedir}/buffio.h
-%{_includedir}/platform.h
-%{_includedir}/tidy*.h
+%{_includedir}/tidy
+%{_pkgconfigdir}/tidy.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libtidy.a
+%{_libdir}/libtidys.a