diff --git a/tidy-html5-5.8.0-use-GNUInstallDirs.patch b/tidy-html5-5.8.0-use-GNUInstallDirs.patch new file mode 100644 index 0000000000000000000000000000000000000000..e95550b872258ddd519c63f9cc7389c6a194ba9c --- /dev/null +++ b/tidy-html5-5.8.0-use-GNUInstallDirs.patch @@ -0,0 +1,13 @@ +--- tidy-html5-5.8.0/CMakeLists.txt.orig 2025-08-23 14:32:17.072586200 +0800 ++++ tidy-html5-5.8.0/CMakeLists.txt 2025-08-23 14:33:23.533468500 +0800 +@@ -380,8 +380,9 @@ + #------------------------------------------------------------------------ + # Target Locations + #------------------------------------------------------------------------ ++include(GNUInstallDirs) + if (NOT LIB_INSTALL_DIR) +- set(LIB_INSTALL_DIR lib${LIB_SUFFIX}) ++ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) + endif () + + if (NOT BIN_INSTALL_DIR) diff --git a/tidy.spec b/tidy.spec index d1eb6828fb5d5101678a60bf3493d55ad7ebf3f7..b1c04a2bbd85a63f8c7e9ceffe3d2933e9e7adea 100644 --- a/tidy.spec +++ b/tidy.spec @@ -3,7 +3,7 @@ Name: tidy Version: 5.8.0 -Release: 4 +Release: 5 Summary: Utility to clean up and pretty print HTML/XHTML/XML License: W3C URL: http://www.html-tidy.org/ @@ -11,6 +11,7 @@ Source0: https://github.com/htacg/%{upname}/archive/%{version}/%{upname}-% Patch0: CVE-2021-33391-pre.patch Patch1: CVE-2021-33391.patch Patch2: tidy-html5-5.8.0-port-to-newer-cmake.patch +Patch3: tidy-html5-5.8.0-use-GNUInstallDirs.patch BuildRequires: gcc-c++ cmake gcc libxslt pkgconfig Provides: tidy-html5 = %{version}-%{release} @@ -73,6 +74,9 @@ ln -s tidyplatform.h $RPM_BUILD_ROOT%{_includedir}/platform.h %{_mandir}/man?/* %changelog +* Sat Aug 23 2025 Funda Wang - 5.8.0-5 +- use GNUInsallDirs for installation + * Tue Mar 04 2025 Funda Wang - 5.8.0-4 - build with cmake 4.0