diff --git a/kf5-frameworkintegration.spec b/kf5-frameworkintegration.spec index 9ce6778..f40bcfb 100644 --- a/kf5-frameworkintegration.spec +++ b/kf5-frameworkintegration.spec @@ -2,10 +2,10 @@ Name: kf5-%{framework} Version: 5.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 4 workspace and cross-framework integration plugins License: LGPLv2+ -URL: https://projects.kde.org/projects/frameworks/frameworkintegration +URL: https://projects.kde.org/frameworkintegration %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -16,15 +16,11 @@ URL: https://projects.kde.org/projects/frameworks/frameworkintegratio %endif Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz -# upstream patches -Patch0: frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch +## downstream patches +#Patch0: frameworkintegration-5.17-workaround-qtmoc-5.6-bug.patch -BuildRequires: kf5-rpm-macros >= %{version} +BuildRequires: cmake BuildRequires: extra-cmake-modules >= %{version} -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel -BuildRequires: qt5-qtdeclarative-devel - BuildRequires: kf5-kconfig-devel >= %{version} BuildRequires: kf5-kconfigwidgets-devel >= %{version} BuildRequires: kf5-ki18n-devel >= %{version} @@ -32,12 +28,18 @@ BuildRequires: kf5-kiconthemes-devel >= %{version} BuildRequires: kf5-kio-devel >= %{version} BuildRequires: kf5-knotifications-devel >= %{version} BuildRequires: kf5-kwidgetsaddons-devel >= %{version} -BuildRequires: oxygen-fonts-devel - +BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: libXcursor-devel +BuildRequires: oxygen-fonts-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel +BuildRequires: qt5-qtx11extras-devel Requires: kf5-filesystem >= %{version} -Requires: oxygen-fonts +# as of 5.17.0, src/platformtheme/kfontsettingsdata.cpp references: Noto Sans, Oxygen-Mono +# not sure if that warrants hard deps here though -- Rex +Recommends: google-noto-sans-fonts +Recommends: oxygen-mono-fonts # prior to 5.11.0-3, main pkg was multilib'd (due to arch'd -devel deps) -- rex Obsoletes: %{name} < 5.11.0-3 @@ -92,7 +94,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files -f frameworkintegration5_qt.lang -%doc COPYING.LIB README.md +%doc README.md +%license COPYING.LIB %{_kf5_datadir}/kf5/infopage/ %{_kf5_datadir}/knotifications5/plasma_workspace.notifyrc # move these to -libs? or just fold -libs back into main pkg ? -- rex @@ -114,6 +117,10 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Dec 16 2015 Rex Dieter - 5.17.0-2 +- drop qt56/moc hack (qtbase should be fixed) +- .spec cosmetics, update URL, use %%license + * Tue Dec 08 2015 Daniel Vrátil - 5.17.0-1 - KDE Frameworks 5.17.0