From f910edb1c6361e4b7d094bb87b06cf1d93004ccc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Jul 09 2018 02:18:55 +0000 Subject: 5.48.0 exclicitly set/use specific python interpeter support python3 on f29+ add runtime deps for jinja2,yaml python modules use %make_build %majmin --- diff --git a/.gitignore b/.gitignore index 72e6f19..f2b2acc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1 @@ -/kapidox-5.18.0.tar.xz -/kapidox-5.19.0.tar.xz -/kapidox-5.20.0.tar.xz -/kapidox-5.21.0.tar.xz -/kapidox-5.22.0.tar.xz -/kapidox-5.23.0.tar.xz -/kapidox-5.24.0.tar.xz -/kapidox-5.25.0.tar.xz -/kapidox-5.26.0.tar.xz -/kapidox-5.27.0.tar.xz -/kapidox-5.29.0.tar.xz -/kapidox-5.31.0.tar.xz -/kapidox-5.32.0.tar.xz -/kapidox-5.33.0.tar.xz -/kapidox-5.34.0.tar.xz -/kapidox-5.35.0.tar.xz -/kapidox-5.36.0.tar.xz -/kapidox-5.37.0.tar.xz -/kapidox-5.38.0.tar.xz -/kapidox-5.39.0.tar.xz -/kapidox-5.40.0.tar.xz -/kapidox-5.41.0.tar.xz -/kapidox-5.42.0.tar.xz -/kapidox-5.43.0.tar.xz -/kapidox-5.44.0.tar.xz -/kapidox-5.45.0.tar.xz -/kapidox-5.46.0.tar.xz -/kapidox-5.47.0.tar.xz /kapidox-5.48.0.tar.xz diff --git a/kf5-kapidox.spec b/kf5-kapidox.spec index 9c1d646..5f73e59 100644 --- a/kf5-kapidox.spec +++ b/kf5-kapidox.spec @@ -1,31 +1,44 @@ %global framework kapidox -Name: kf5-%{framework} +Name: kf5-%{framework} Version: 5.48.0 Release: 1%{?dist} -Summary: KDE Frameworks 5 Tier 4 scripts and data for building API documentation +Summary: KDE Frameworks 5 Tier 4 scripts and data for building API documentation -License: BSD -URL: https://cgit.kde.org/%{framework}.git +License: BSD +URL: https://cgit.kde.org/%{framework}.git -%global versiondir %(echo %{version} | cut -d. -f1-2) +%global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 %global stable unstable %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches # make sure BuildArch comes *after* patches, to ensure %%autosetup works right BuildArch: noarch -BuildRequires: kf5-rpm-macros >= %{version} -BuildRequires: python2-devel +BuildRequires: kf5-rpm-macros >= %{majmin} -Requires: kf5-filesystem >= %{version} +Requires: kf5-filesystem >= %{majmin} + +%if 0%{?fedora} > 28 +BuildRequires: python3-devel python3 +%global __python %{__python3} +%global python_sitelib %{python3_sitelib} +Requires: python3-jinja2 +Requires: python3-PyYAML +%else +BuildRequires: python2-devel python2 +%global __python %{__python2} +%global python_sitelib %{python2_sitelib} +Requires: python2-jinja2 +Requires: python2-pyyaml +%endif %description Scripts and data for building API documentation (dox) in a standard format and @@ -39,10 +52,11 @@ style. %build mkdir %{_target_platform} pushd %{_target_platform} -%{cmake_kf5} .. +%{cmake_kf5} .. \ + -DPYTHON_EXECUTABLE:PATH=%__python popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -51,8 +65,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files %license LICENSE -%{python2_sitelib}/kapidox -%{python2_sitelib}/kapidox-%{version}-py2.7.egg-info +%{python_sitelib}/kapidox +%{python_sitelib}/kapidox-%{version}-py*.egg-info %{_kf5_bindir}/depdiagram-prepare %{_kf5_bindir}/depdiagram-generate %{_kf5_bindir}/depdiagram-generate-all @@ -63,6 +77,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog * Mon Jul 09 2018 Rex Dieter - 5.48.0-1 - 5.48.0 +- exclicitly set/use specific python interpeter +- support python3 on f29+ +- add runtime deps for jinja2,yaml python modules +- use %%make_build %%majmin * Sat Jun 02 2018 Rex Dieter - 5.47.0-1 - 5.47.0