diff --git a/kdoctools-5.55.0.tar.xz b/kdoctools-5.55.0.tar.xz deleted file mode 100644 index 4ff4404..0000000 Binary files a/kdoctools-5.55.0.tar.xz and /dev/null differ diff --git a/kdoctools-5.90.0.tar.xz b/kdoctools-5.90.0.tar.xz new file mode 100644 index 0000000..3ccee2d Binary files /dev/null and b/kdoctools-5.90.0.tar.xz differ diff --git a/kf5-kdoctools.spec b/kf5-kdoctools.spec index 57d21b2..87f20f8 100644 --- a/kf5-kdoctools.spec +++ b/kf5-kdoctools.spec @@ -1,12 +1,19 @@ %global framework kdoctools -Name: kf5-%{framework} -Version: 5.55.0 -Release: 2 -Summary: KDE Frameworks 5 Tier 2 addon for generating documentation +# uncomment to enable bootstrap mode +#global bootstrap 1 -License: GPLv2+ and MIT -URL: https://cgit.kde.org/%{framework}.git +%if !0%{?bootstrap} +%global tests 1 +%endif + +Name: kf5-%{framework} +Version: 5.90.0 +Release: 1 +Summary: KDE Frameworks 5 Tier 2 addon for generating documentation + +License: GPLv2+ and MIT +URL: https://invent.kde.org/frameworks/%{framework} %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -27,13 +34,10 @@ BuildRequires: kf5-ki18n-devel >= %{majmin} BuildRequires: libxml2-devel BuildRequires: libxslt-devel -#%if 0%{?fedora} || 0%{?rhel} > 7 -#%global _with_html --with-html +%global _with_html --with-html BuildRequires: perl-generators -#BuildRequires: perl(Any::URI::Escape) -#%else -BuildRequires: perl(URI::Escape) -#%endif +%global perl_uri_escape perl(URI::Escape) +BuildRequires: %{perl_uri_escape} BuildRequires: qt5-qtbase-devel Requires: docbook-dtds @@ -47,11 +51,7 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Provides: kf5-kdoctools-static = %{version}-%{release} Requires: qt5-qtbase-devel -#%%if 0%{?fedora} || 0%{?rhel} > 7 -#Requires: perl(Any::URI::Escape) -#%%else -Requires: perl(URI::Escape) -#%%endif +Requires: %{perl_uri_escape} %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. @@ -64,7 +64,7 @@ developing applications that use %{name}. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +%{cmake_kf5} .. %{?tests:-DBUILD_TESTING:BOOL=ON} popd %make_build -C %{_target_platform} @@ -76,11 +76,18 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang %{name} --all-name --with-man %{?_with_html} +%check +%if 0%{?tests} +export CTEST_OUTPUT_ON_FAILURE=1 +make test -C %{_target_platform} ARGS="--output-on-failure --timeout 300" ||: +%endif + + %ldconfig_scriptlets %files -f %{name}.lang %doc README.md -%license COPYING.LIB +%license LICENSES/*.txt %{_kf5_libdir}/libKF5DocTools.so.5* ## FIXME/TODO: which of these to move to -devel -- rex %{_kf5_bindir}/checkXML5 @@ -99,6 +106,12 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat Feb 12 2022 tanyulong - 5.90.0-1 +- update to upstream version 5.90.0 + +* Thu Jan 13 2022 pei-jiankang - 5.88.0-1 +- update to upstream version 5.88.0 + * Thu Nov 5 2020 douyan - 5.55.0-2 - remove perl(Any::URI::Escape) dependency