diff --git a/.gitignore b/.gitignore index 4a8f078..734927d 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,7 @@ libxml2-2.7.7.tar.gz /libxml2-2.11.6.tar.xz /libxml2-2.12.0.tar.xz /libxml2-2.12.1.tar.xz +/libxml2-2.12.2.tar.xz +/xmlts20080827.tar.gz +/xsts-2002-01-16.tar.gz +/xsts-2004-01-14.tar.gz diff --git a/libxml2.spec b/libxml2.spec index eb927d8..7fab4db 100644 --- a/libxml2.spec +++ b/libxml2.spec @@ -1,11 +1,18 @@ Name: libxml2 -Version: 2.12.1 +Version: 2.12.2 Release: 1%{?dist} Summary: Library providing XML and HTML support -License: MIT -URL: http://xmlsoft.org/ +# Libxml2 is covered under MIT, and the conformance and test suite data in +# Source1, Source2 and Source3 is covered by W3C. +License: MIT AND W3C +URL: https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home Source0: https://download.gnome.org/sources/%{name}/2.12/%{name}-%{version}.tar.xz +# https://www.w3.org/XML/Test/xmlconf-20080827.html +Source1: https://www.w3.org/XML/Test/xmlts20080827.tar.gz +# https://www.w3.org/XML/2004/xml-schema-test-suite/index.html +Source2: https://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz +Source3: https://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz Patch0: libxml2-multilib.patch # Patch from openSUSE. # See: https://bugzilla.gnome.org/show_bug.cgi?id=789714 @@ -95,12 +102,22 @@ touch -m --reference=%{buildroot}%{_includedir}/libxml2/libxml/parser.h %{buildr find %{buildroot} -type f -name '*.la' -print -delete rm -vf %{buildroot}{%{python2_sitearch},%{python3_sitearch}}/*.a rm -vrf %{buildroot}%{_datadir}/doc/ -(cd doc/examples ; make clean ; rm -rf .deps Makefile) gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %check -# Tests require the XML conformance suite, and fail in doc/examples somwhere. -#%make_build runtests +# Tests require the XML conformance suite. +tar -xzvf %{SOURCE1} +%make_build check +rm -rf xmlconf +# Schema tests use the schema test suite. +cp %{SOURCE2} %{SOURCE3} xstc/ +pushd xstc +mkdir Tests +make tests +popd +# As the directory is copied to the devel subpackage, remove any build +# artifacts. +(cd doc/examples ; make clean ; rm -rf .deps Makefile) %ldconfig_scriptlets @@ -108,10 +125,10 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %license Copyright %doc NEWS README.md %{_libdir}/libxml2.so.2* -%{_bindir}/xmllint -%{_mandir}/man1/xmllint.1* %{_bindir}/xmlcatalog +%{_bindir}/xmllint %{_mandir}/man1/xmlcatalog.1* +%{_mandir}/man1/xmllint.1* %files devel %doc doc/*.html @@ -119,14 +136,14 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %doc doc/examples %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/libxml2/ -%{_libdir}/libxml2.so -%{_includedir}/libxml2/ -%{_bindir}/xml2-config -%{_mandir}/man1/xml2-config.1* %{_datadir}/aclocal/libxml.m4 +%{_datadir}/gtk-doc/html/libxml2/ +%{_includedir}/libxml2/ +%{_libdir}/libxml2.so %{_libdir}/pkgconfig/libxml-2.0.pc %{_libdir}/cmake/libxml2/ +%{_bindir}/xml2-config +%{_mandir}/man1/xml2-config.1* %files static %license Copyright @@ -141,6 +158,10 @@ gzip -9 -c doc/libxml2-api.xml > doc/libxml2-api.xml.gz %{python3_sitelib}/__pycache__/drv_libxml2.* %changelog +* Wed Dec 06 2023 David King - 2.12.2-1 +- Update to 2.12.2 (#2137281) +- Enable W3C XML Conformance and Schema test suites + * Fri Nov 24 2023 David King - 2.12.1-1 - Update to 2.12.1 (#2250062) diff --git a/sources b/sources index c7a09a5..09c48b6 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -SHA512 (libxml2-2.12.1.tar.xz) = 84ade06df7d170b777cfe701389444176a02714b1d8f1916d022ef6cf7cf85822571989608dcecc470c2eec044a65dd971562a95921ddb1668736295a5be2806 +SHA512 (xsts-2002-01-16.tar.gz) = 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 +SHA512 (xsts-2004-01-14.tar.gz) = 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe +SHA512 (xmlts20080827.tar.gz) = 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d +SHA512 (libxml2-2.12.2.tar.xz) = 4511e03dfd08ffad6a633d79828a6049e75769a2ad9fb93ef0f553b3668e517863b648c0923c71d9b58ff7452530fdf789e611720aed8dea60bbdfe476cde1d2