Hello community, here is the log from the commit of package tidy for openSUSE:Factory checked in at 2017-05-18 20:42:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tidy (Old) and /work/SRC/openSUSE:Factory/.tidy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tidy" Thu May 18 20:42:01 2017 rev:22 rq:492989 version:5.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tidy/tidy.changes 2016-08-12 15:37:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.tidy.new/tidy.changes 2017-05-18 20:42:03.496282973 +0200 @@ -1,0 +2,21 @@ +Fri May 5 09:49:55 UTC 2017 - adam.ma...@suse.de + +- actually enable and distribute compat headers +- explicitly list headers instead of globing so nothing + "disappears" with version updates + +------------------------------------------------------------------- +Mon Apr 10 08:18:55 UTC 2017 - adam.ma...@suse.de + +- new upstream version 5.4.0 +- compat_headers.diff: upstreamed +- static_buffer_overflow.diff: upstreamed +- updated documentation to current + + tidy-html5-doxygen-a8e47dc.tar.gz replaced by + tidy-html5-doxygen-c0d1cd1.tar.gz +- updated unit tests to current + + a510b54.tar.gz replaced by 97cf741.tar.gz +- fix_doxygen_paths.diff: refreshed +- test_fixes.diff: refreshed + +------------------------------------------------------------------- Old: ---- 5.2.0.tar.gz a510b54.tar.gz compat_headers.diff static_buffer_overflow.diff tidy-html5-doxygen-a8e47dc.tar.gz New: ---- 5.4.0.tar.gz 97cf741.tar.gz tidy-html5-doxygen-c0d1cd1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tidy.spec ++++++ --- /var/tmp/diff_new_pack.3ow85w/_old 2017-05-18 20:42:04.404154850 +0200 +++ /var/tmp/diff_new_pack.3ow85w/_new 2017-05-18 20:42:04.404154850 +0200 @@ -1,7 +1,7 @@ # # spec file for package tidy # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define regression_tests a510b54 -%define documentation a8e47dc +%define regression_tests 97cf741 +%define documentation c0d1cd1 Name: tidy -Version: 5.2.0 +Version: 5.4.0 Release: 0 Summary: Utility to Clean Up and Pretty-print HTML, XHTML or XML Markup License: W3C @@ -30,15 +30,13 @@ # Latest version of unit tests Source1: https://github.com/htacg/tidy-html5-tests/archive/%{regression_tests}.tar.gz # Documentation generation files, extracted from -# https://github.com/htacg/tidy-html5-tests/archive/%%{documentation}.tar.gz +# https://github.com/htacg/html-tidy.org.api.git/archive/%%{documentation}.tar.gz # using tidy_generate_documentation.sh Source2: tidy-html5-doxygen-%{documentation}.tar.gz Source10: tidy_fetch_docs.sh Patch0: dynamic_library_build.diff Patch1: test_fixes.diff Patch2: fix_doxygen_paths.diff -Patch3: compat_headers.diff -Patch4: static_buffer_overflow.diff BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ @@ -102,13 +100,12 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 %build %cmake \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ - -DINCLUDE_INSTALL_DIR:PATH=include/%{name} + -DINCLUDE_INSTALL_DIR:PATH=include/%{name} \ + -DTIDY_COMPAT_HEADERS:BOOL=ON make %{?_smp_mflags} ../tidy-html5-doxygen/build_docs.sh @@ -135,7 +132,12 @@ %files -n libtidy-devel %defattr(-, root, root) %dir %{_includedir}/%{name} -%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/tidy.h +%{_includedir}/%{name}/tidybuffio.h +%{_includedir}/%{name}/tidyenum.h +%{_includedir}/%{name}/tidyplatform.h +%{_includedir}/%{name}/buffio.h +%{_includedir}/%{name}/platform.h %{_libdir}/libtidy.so %changelog ++++++ 5.2.0.tar.gz -> 5.4.0.tar.gz ++++++ ++++ 5121 lines of diff (skipped) ++++++ 5.2.0.tar.gz -> 97cf741.tar.gz ++++++ ++++ 113030 lines of diff (skipped) ++++++ debian.series ++++++ --- /var/tmp/diff_new_pack.3ow85w/_old 2017-05-18 20:42:05.020067930 +0200 +++ /var/tmp/diff_new_pack.3ow85w/_new 2017-05-18 20:42:05.020067930 +0200 @@ -1,5 +1,4 @@ dynamic_library_build.diff test_fixes.diff fix_doxygen_paths.diff -compat_headers.diff ++++++ fix_doxygen_paths.diff ++++++ --- /var/tmp/diff_new_pack.3ow85w/_old 2017-05-18 20:42:05.044064544 +0200 +++ /var/tmp/diff_new_pack.3ow85w/_new 2017-05-18 20:42:05.044064544 +0200 @@ -1,8 +1,8 @@ -Index: tidy-html5-5.2.0/tidy-html5-doxygen/build_docs.sh +Index: tidy-html5-5.4.0/tidy-html5-doxygen/build_docs.sh =================================================================== ---- tidy-html5-5.2.0.orig/tidy-html5-doxygen/build_docs.sh -+++ tidy-html5-5.2.0/tidy-html5-doxygen/build_docs.sh -@@ -18,18 +18,18 @@ +--- tidy-html5-5.4.0.orig/tidy-html5-doxygen/build_docs.sh ++++ tidy-html5-5.4.0/tidy-html5-doxygen/build_docs.sh +@@ -18,16 +18,16 @@ ########################################################### SCRIPT=$(basename $0) @@ -15,21 +15,18 @@ +OUTP_DIR="./docs" -DOXY_CFG="./doxygen.cfg" --PATH_EXAMPLES="./examples" +DOXY_CFG="$PATH_TIDY_HTML5/doxygen.cfg" -+PATH_EXAMPLES="$PATH_TIDY_HTML5/examples" - NAME_LICENSE="LICENSE.md" --PATH_LICENSE="$PATH_TIDY_HTML5/README/$NAME_LICENSE" -PATH_SRC="$PATH_TIDY_HTML5/src" -PATH_INC="$PATH_TIDY_HTML5/include" -+PATH_LICENSE="$PATH_TIDY_HTML5/../README/$NAME_LICENSE" +-PATH_CONSOLE="$PATH_TIDY_HTML5/console/tidy.c" +PATH_SRC="$PATH_TIDY_HTML5/../src" +PATH_INC="$PATH_TIDY_HTML5/../include" ++PATH_CONSOLE="$PATH_TIDY_HTML5/../console/tidy.c" ########################################################### -@@ -142,8 +142,8 @@ TIDY_VERSION="$(echo $TIDY_VERSION_STRIN +@@ -129,8 +129,8 @@ TIDY_VERSION="$(echo $TIDY_VERSION_STRIN ########################################################### # Additional variables needed by the configuration: ########################################################### @@ -37,10 +34,10 @@ -PATH_WEBSITE="tidylib_api_$TIDY_VERSION" +PATH_QUICKREF="quickref.html" +PATH_WEBSITE="api" - PATH_QUICKREF_INCLUDE="$PATH_EXAMPLES/quickref_include.html" + PATH_QUICKREF_INCLUDE="$OUTP_DIR/quickref_include.html" -@@ -153,8 +153,7 @@ PATH_QUICKREF_INCLUDE="$PATH_EXAMPLES/qu +@@ -140,8 +140,7 @@ PATH_QUICKREF_INCLUDE="$OUTP_DIR/quickre cat << HEREDOC The script is generating the versioned 'quickref.html' file and the Tidy API @@ -50,7 +47,7 @@ The following files/directories will be placed into $OUTP_DIR/: -@@ -186,11 +185,11 @@ $TIDY_PATH -xml-config > "$OUTP_DIR/tidy +@@ -173,11 +172,11 @@ $TIDY_PATH -xml-config > "$OUTP_DIR/tidy # 'quickref.html' # 'quickref_include.html' for the Doxygen build @@ -60,34 +57,30 @@ +xsltproc "$PATH_TIDY_HTML5/quickref.include.xsl" "$OUTP_DIR/tidy-config.xml" > "$PATH_QUICKREF_INCLUDE" # Tidy quickref.html --$TIDY_PATH -quiet -config "./tidy.cfg" -modify "$OUTP_DIR/$PATH_QUICKREF" >& /dev/null -+$TIDY_PATH -quiet -config "$PATH_TIDY_HTML5/tidy.cfg" -modify "$OUTP_DIR/$PATH_QUICKREF" >& /dev/null +-$TIDY_PATH -quiet -config "./tidy-quickref.cfg" -modify "$OUTP_DIR/$PATH_QUICKREF" >& /dev/null ++$TIDY_PATH -quiet -config "$PATH_TIDY_HTML5/tidy-quickref.cfg" -modify "$OUTP_DIR/$PATH_QUICKREF" >& /dev/null # Cleanup rm "$OUTP_DIR/tidy-config.xml" -@@ -217,16 +216,20 @@ cp "$PATH_LICENSE" "$PATH_EXAMPLES" - # - echoes and catches output of the doxygen config +@@ -198,14 +197,18 @@ echo "=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # - overwrites some vars but appending some to config at end # - which are then passed to doxygen as stdin (instead of the path to a config.file) -+ ( cat "$DOXY_CFG"; \ -- echo "INPUT=\"$PATH_INC\" \"./\" \"./pages\"" -+ echo "INPUT=\"$PATH_INC\" \"$PATH_TIDY_HTML5\" \"$PATH_TIDY_HTML5/pages\""; \ -+ echo "HTML_EXTRA_STYLESHEET=\"$PATH_TIDY_HTML5/style.css\""; \ -+ echo "LAYOUT_FILE=\"$PATH_TIDY_HTML5/DoxygenLayout.xml\""; \ -+ echo "EXAMPLE_PATH=\"$PATH_TIDY_HTML5/examples/\""; \ - echo "INCLUDE_PATH=\"$PATH_SRC\""; \ -- echo "EXCLUDE=\"$PATH_INC/tidyplatform.h\"" -- echo "OUTPUT_DIRECTORY=\"$OUTP_DIR\"" -+ echo "EXCLUDE=\"$PATH_INC/tidyplatform.h\""; \ -+ echo "OUTPUT_DIRECTORY=\"$OUTP_DIR\""; \ - echo "PROJECT_NUMBER=$TIDY_VERSION"; \ +- echo "INPUT=\"$PATH_INC\" \"$PATH_SRC\" \"$PATH_CONSOLE\" \"./\" \"./pages/\" \"./pages/general\" \"./pages/libtidy\" \"./pages/programming\"" ++ echo "INPUT=\"$PATH_INC\" \"$PATH_SRC\" \"$PATH_CONSOLE\" \"$PATH_TIDY_HTML5\" \"$PATH_TIDY_HTML5/pages/\" \"$PATH_TIDY_HTML5/pages/general\" \"$PATH_TIDY_HTML5/pages/libtidy\" \"$PATH_TIDY_HTML5/pages/programming\""; ++ echo "HTML_EXTRA_STYLESHEET=\"$PATH_TIDY_HTML5/style.css\"" ++ echo "LAYOUT_FILE=\"$PATH_TIDY_HTML5/DoxygenLayout.xml\"" ++ echo "EXAMPLE_PATH=\"$PATH_TIDY_HTML5/examples/\"" + echo "INCLUDE_PATH=\"$PATH_SRC\"" + echo "OUTPUT_DIRECTORY=\"$OUTP_DIR\"" + echo "EXAMPLE_PATH=\"$OUTP_DIR\"" + echo "PROJECT_NUMBER=$TIDY_VERSION" echo "HTML_OUTPUT=\"$PATH_WEBSITE\"" - echo "GENERATE_TAGFILE=\"$OUTP_DIR/$PATH_WEBSITE/tidy.tags\""; \ -- echo "HTML_EXTRA_FILES= $PATH_EXAMPLES/tidy.help.txt $PATH_EXAMPLES/tidy.config.txt"; ) \ +- echo "HTML_EXTRA_FILES= sun_blast.svg"; ) \ -| doxygen - > /dev/null -+ echo "HTML_EXTRA_FILES=\"$PATH_EXAMPLES/tidy.help.txt\" \"$PATH_EXAMPLES/tidy.config.txt\""; ) \ ++ echo "HTML_TIMESTAMP=NO" ++ echo "HTML_EXTRA_FILES=\"$PATH_TIDY_HTML5/sun_blast.svg\""; ) \ +| doxygen - # cleanup - rm "$PATH_EXAMPLES/tidy.help.txt" + rm "$PATH_QUICKREF_INCLUDE" ++++++ test_fixes.diff ++++++ --- /var/tmp/diff_new_pack.3ow85w/_old 2017-05-18 20:42:05.064061721 +0200 +++ /var/tmp/diff_new_pack.3ow85w/_new 2017-05-18 20:42:05.068061157 +0200 @@ -1,105 +1,25 @@ -Index: tidy-html5-5.2.0/tests/html5/testhtml5.sh +Index: tidy-html5-5.4.0/tests/tools-sh/t1.sh =================================================================== ---- tidy-html5-5.2.0.orig/tests/html5/testhtml5.sh -+++ tidy-html5-5.2.0/tests/html5/testhtml5.sh -@@ -19,7 +19,7 @@ failed() - TMPCNT3=$((${TMPCNT3} + 1)); - } - --TMPEXE="../../build/cmake/tidy" -+TMPEXE="../../build/tidy" - [ -e ${TMPEXE} ] || noexe - - TMPINP=temphtml5.cfg -@@ -29,7 +29,6 @@ ${TMPEXE} -h > /dev/null || noexe - - if [ ! -e "${TMPDIR}" ]; then - echo "Will create the folder ${TMPDIR} for output" -- read - - mkdir ${TMPDIR} || noout - fi -@@ -41,7 +40,6 @@ fi - - if [ ! -e "${TMPINP}" ]; then - echo "Creating a CONFIG file ${TMPINP}" -- read - - cat <<EOF > ${TMPINP} - wrap: 99 -@@ -93,5 +91,6 @@ if [ "${TMPCNT3}" = 0 ]; then - echo "With NO WARNINGS or ERRORS! This is a *** SUCCESS ***" - else - echo "However have ${TMPCNT3} WARNINGS or ERRORS! This is a *** FAILURE ***" -+ exit 1 - fi - echo -Index: tidy-html5-5.2.0/tests/t1.sh -=================================================================== ---- tidy-html5-5.2.0.orig/tests/t1.sh -+++ tidy-html5-5.2.0/tests/t1.sh -@@ -20,7 +20,7 @@ BN=`basename $0` - #@REM ================================================================= - - #@REM setup the ENVIRONMENT --TIDY="../build/cmake/tidy" -+TIDY="../build/tidy" - TIDYOUT="tmp" - TMPLOG="temptest1.txt" - -@@ -210,6 +210,7 @@ if [ "$ERRCNT" = "0" ]; then +--- tidy-html5-5.4.0.orig/tests/tools-sh/t1.sh ++++ tidy-html5-5.4.0/tests/tools-sh/t1.sh +@@ -176,6 +176,7 @@ if [ "$ERRCNT" = "0" ]; then else echo "$BN: Carefully REVIEW the above differences on $TMPCASE $TMPEXIT! *** ACTION REQUIRED ***" - echo "$BN: Carefully REVIEW the above differences on $TMPCASE $TMPEXIT! *** ACTION REQUIRED ***" >> $TMPLOG + echo "$BN: Carefully REVIEW the above differences on $TMPCASE $TMPEXIT! *** ACTION REQUIRED ***" >> "${TY_RESULTS_FILE}" + exit 1 fi echo "" - echo "# eof" >> $TMPLOG -Index: tidy-html5-5.2.0/tests/testaccessone.sh -=================================================================== ---- tidy-html5-5.2.0.orig/tests/testaccessone.sh -+++ tidy-html5-5.2.0/tests/testaccessone.sh -@@ -20,7 +20,7 @@ TESTNO=$1 - TESTEXPECTED=$2 - ACCESSLEVEL=$3 - --TIDY=../build/cmake/tidy -+TIDY=../build/tidy - INFILES=./accessTest/$1.*ml - CFGFILE=./accessTest/cfg_$1.txt - -Index: tidy-html5-5.2.0/tests/testall.sh + echo "# eof" >> "${TY_RESULTS_FILE}" +Index: tidy-html5-5.4.0/tests/tools-sh/testall.sh =================================================================== ---- tidy-html5-5.2.0.orig/tests/testall.sh -+++ tidy-html5-5.2.0/tests/testall.sh -@@ -18,7 +18,7 @@ d_now() - # testone.sh uses tempall.txt, so - TMPLOG="tempall.txt" - # same EXE --TMPTIDY=../build/cmake/tidy -+TMPTIDY=../build/tidy - - TMPNOW=`d_now` - TMPINP="testcases.txt" -@@ -57,7 +57,7 @@ echo "================================== +--- tidy-html5-5.4.0.orig/tests/tools-sh/testall.sh ++++ tidy-html5-5.4.0/tests/tools-sh/testall.sh +@@ -56,7 +56,7 @@ echo "================================== while read bugNo expected do - # echo Testing $bugNo | tee -a $TMPLOG -- ./testone.sh $bugNo $expected | tee -a $TMPLOG + # echo Testing $bugNo | tee -a "${TY_RESULTS_FILE}" +- ./testone.sh $bugNo $expected | tee -a "${TY_RESULTS_FILE}" + ./testone.sh $bugNo $expected || exit 1 done < $TMPINP - echo "========================================" >> $TMPLOG + echo "========================================" >> "${TY_RESULTS_FILE}" -Index: tidy-html5-5.2.0/tests/testone.sh -=================================================================== ---- tidy-html5-5.2.0.orig/tests/testone.sh -+++ tidy-html5-5.2.0/tests/testone.sh -@@ -19,7 +19,7 @@ set +f - TESTNO=$1 - EXPECTED=$2 - #TIDY=../bin/tidy --TIDY=../build/cmake/tidy -+TIDY=../build/tidy - if [ ! -f "$TIDY" ]; then - echo "$BN: Can NOT locate binary '$TIDY'!" - echo "$BN: Fix me with the correct location of the binary to run." ++++++ tidy-html5-doxygen-a8e47dc.tar.gz -> tidy-html5-doxygen-c0d1cd1.tar.gz ++++++ ++++ 3677 lines of diff (skipped)
