diff --git a/kdeedu-data.spec b/kdeedu-data.spec index 743c2af..65e767d 100644 --- a/kdeedu-data.spec +++ b/kdeedu-data.spec @@ -1,11 +1,14 @@ -%undefine __cmake_in_source_build + +## disable for now, but leave option open if needed for awhile -- rex +#global kde4_compat 1 + Name: kdeedu-data Summary: Shared icons, artwork and data files for educational applications Version: 20.12.2 Release: 1%{?dist} License: GPLv2 -URL: https://cgit.kde.org/%{name}.git +URL: https://invent.kde.org/education/%{name} %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -26,7 +29,9 @@ BuildRequires: qt5-qtbase-devel Obsoletes: libkdeedu < 14 Requires: hicolor-icon-theme +%if 0%{?kde4_compat} Requires: kde-filesystem +%endif %description %{summary}. @@ -37,24 +42,29 @@ Requires: kde-filesystem %build -%{cmake_kf5} +%cmake_kf5 + %cmake_build %install %cmake_install +%if 0%{?kde4_compat} # previous packages shipped %%{_kde4_appsdir}/kvtml , so let's # (hard)link data in in both places mkdir -p %{buildroot}%{_kde4_appsdir} cp -alf \ %{buildroot}%{_kf5_datadir}/apps/kvtml/ \ %{buildroot}%{_kde4_appsdir} +%endif %files %license COPYING +%if 0%{?kde4_compat} %{_kde4_appsdir}/kvtml/ +%endif %{_kf5_datadir}/apps/kvtml/ %{_datadir}/icons/hicolor/*/*/* @@ -62,6 +72,7 @@ cp -alf \ %changelog * Tue Feb 02 2021 Rex Dieter - 20.12.2-1 - 20.12.2 +- disable kde4 compatibility (for now) * Tue Jan 26 2021 Fedora Release Engineering - 20.08.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild