diff --git a/.gitignore b/.gitignore index 00df99d..568a816 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,19 @@ /kdoctools-5.66.0.tar.xz /kdoctools-5.67.0.tar.xz /kdoctools-5.68.0.tar.xz +/kdoctools-5.69.0.tar.xz +/kdoctools-5.70.0.tar.xz +/kdoctools-5.71.0.tar.xz +/kdoctools-5.72.0.tar.xz +/kdoctools-5.73.0.tar.xz +/kdoctools-5.74.0.tar.xz +/kdoctools-5.75.0.tar.xz +/kdoctools-5.76.0.tar.xz +/kdoctools-5.77.0.tar.xz +/kdoctools-5.78.0.tar.xz +/kdoctools-5.79.0.tar.xz +/kdoctools-5.80.0.tar.xz +/kdoctools-5.81.0.tar.xz +/kdoctools-5.82.0.tar.xz +/kdoctools-5.83.0.tar.xz +/kdoctools-5.85.0.tar.xz diff --git a/kf5-kdoctools.spec b/kf5-kdoctools.spec index a17da49..59b162f 100755 --- a/kf5-kdoctools.spec +++ b/kf5-kdoctools.spec @@ -1,12 +1,19 @@ %global framework kdoctools +# uncomment to enable bootstrap mode +#global bootstrap 1 + +%if !0%{?bootstrap} +%global tests 1 +%endif + Name: kf5-%{framework} -Version: 5.68.0 +Version: 5.85.0 Release: 1%{?dist} Summary: KDE Frameworks 5 Tier 2 addon for generating documentation License: GPLv2+ and MIT -URL: https://cgit.kde.org/%{framework}.git +URL: https://invent.kde.org/frameworks/%{framework} %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -30,10 +37,13 @@ BuildRequires: libxslt-devel %if 0%{?fedora} || 0%{?rhel} > 7 %global _with_html --with-html BuildRequires: perl-generators -BuildRequires: perl(Any::URI::Escape) +%endif +%if 0%{?fedora} || 0%{?epel} > 7 +%global perl_uri_escape perl(Any::URI::Escape) %else -BuildRequires: perl(URI::Escape) +%global perl_uri_escape perl(URI::Escape) %endif +BuildRequires: %{perl_uri_escape} BuildRequires: qt5-qtbase-devel Requires: docbook-dtds @@ -47,11 +57,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}. @@ -62,25 +68,30 @@ developing applications that use %{name}. %build -mkdir %{_target_platform} -pushd %{_target_platform} -%{cmake_kf5} .. -popd +%cmake_kf5 \ + %{?tests:-DBUILD_TESTING:BOOL=ON} -%make_build -C %{_target_platform} +%cmake_build %install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%cmake_install %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 +110,72 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Thu Aug 12 2021 Rex Dieter - 5.85.0-1 +- 5.85.0 + +* Thu Jul 22 2021 Fedora Release Engineering - 5.83.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jun 12 2021 Rex Dieter - 5.83.0-2 +- respin + +* Tue Jun 08 2021 Rex Dieter - 5.83.0-1 +- 5.83.0 + +* Mon May 03 2021 Rex Dieter - 5.82.0-1 +- 5.82.0 + +* Tue Apr 06 2021 Rex Dieter - 5.81.0-1 +- 5.81.0 + +* Tue Mar 09 2021 Rex Dieter - 5.80.0-1 +- 5.80.0 + +* Sat Feb 06 2021 Rex Dieter - 5.79.0-2 +- respin + +* Sat Feb 06 2021 Rex Dieter - 5.79.0-1 +- 5.79.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 5.78.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 4 08:45:25 CST 2021 Rex Dieter - 5.78.0-1 +- 5.78.0 + +* Sun Dec 13 14:12:33 CST 2020 Rex Dieter - 5.77.0-1 +- 5.77.0 + +* Thu Nov 19 09:01:13 CST 2020 Rex Dieter - 5.76.0-1 +- 5.76.0 + +* Wed Oct 14 09:53:21 CDT 2020 Rex Dieter - 5.75.0-1 +- 5.75.0 + +* Fri Sep 18 2020 Jan Grulich - 5.74.0-1 +- 5.74.0 + +* Mon Aug 03 2020 Rex Dieter - 5.73.0-1 +- 5.73.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 5.72.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 07 2020 Rex Dieter - 5.72.0-1 +- 5.72.0 + +* Tue Jun 16 2020 Rex Dieter - 5.71.0-1 +- 5.71.0 + +* Fri Jun 05 2020 Rex Dieter - 5.70.0-2 +- allow use of perl(URI::Escape) on pure rhel, enable tests + +* Mon May 04 2020 Rex Dieter - 5.70.0-1 +- 5.70.0 + +* Tue Apr 21 2020 Rex Dieter - 5.69.0-1 +- 5.69.0 + * Fri Mar 20 2020 Rex Dieter - 5.68.0-1 - 5.68.0 diff --git a/sources b/sources index 9ee5e45..a576d6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdoctools-5.68.0.tar.xz) = 5f39e0193bf8cbad90a579394730e72fce741673ef7a600198b5d05fac0bd25bb785c8edd68ed9d852a4b1b4be856db4fd9d37ec5719a7943177cc19a6ccd34b +SHA512 (kdoctools-5.85.0.tar.xz) = b0118c94a3a4520076e9849ca4a7cfe13ec13ea7486d2c7bf81689a6ec6b23280793d87057513ebf45291c400a59d110583411eca9ffdacddc5c53d5a2ff4620