diff --git a/.gitignore b/.gitignore index 9d313d1..94503e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -/breeze-5.6.95.tar.xz -/breeze-5.7.0.tar.xz -/breeze-5.7.1.tar.xz -/breeze-5.7.2.tar.xz -/breeze-5.7.3.tar.xz /breeze-5.7.4.tar.xz diff --git a/plasma-breeze.spec b/plasma-breeze.spec index 3f304e7..529ad11 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -4,7 +4,7 @@ Name: plasma-breeze Version: 5.7.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop License: GPLv2+ @@ -18,30 +18,28 @@ URL: https://quickgit.kde.org/?p=%{base_name}.git %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz -BuildRequires: kf5-rpm-macros -BuildRequires: extra-cmake-modules -BuildRequires: qt5-qtbase-devel -BuildRequires: qt5-qtx11extras-devel +%global majmin_ver %(echo %{version} | cut -d. -f1,2) -BuildRequires: kf5-kservice-devel +BuildRequires: extra-cmake-modules +BuildRequires: gettext +BuildRequires: kdecoration-devel >= %{majmin_ver} +BuildRequires: kf5-kauth-devel +BuildRequires: kf5-frameworkintegration-devel BuildRequires: kf5-kcmutils-devel -BuildRequires: kf5-plasma-devel - -# kde4breeze -BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kcompletion-devel BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-kcoreaddons-devel BuildRequires: kf5-kguiaddons-devel - -# kstyle BuildRequires: kf5-ki18n-devel -BuildRequires: kf5-kcompletion-devel -BuildRequires: kf5-frameworkintegration-devel +BuildRequires: kf5-kpackage-devel +BuildRequires: kf5-kservice-devel +BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kwindowsystem-devel -BuildRequires: kdecoration-devel - +BuildRequires: kf5-plasma-devel +BuildRequires: kf5-rpm-macros BuildRequires: libxcb-devel - -BuildRequires: gettext +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel Requires: kf5-filesystem @@ -122,6 +120,15 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform}_kde4 %endif +# appdata/metainfo generation *sometimes* fails, need to figure out why (see below) +# in the meantime, let's unconditionally omit it, until we know more +#### +# CMake Warning at /usr/lib/cmake/KF5Package/KF5PackageMacros.cmake:45 (message): +# couldn't generate metainfo for org.kde.breezedark.desktop: Error: Can't +# find plugin metadata: /builddir/build/BUILD/breeze-5.7.4/lookandfeel.dark +#### +rm -fv %{buildroot}%{_kf5_metainfodir}/org.kde.breezedark.desktop.appdata.xml + # omit/rename kde4breeze.upd, seems to be causing problems for # (at least) new users, lame workaround for # http://bugzilla.redhat.com/1283348 @@ -155,13 +162,14 @@ fi %{_kf5_datadir}/kservices5/breezedecorationconfig.desktop %{_kf5_datadir}/kservices5/breezestyleconfig.desktop %{_kf5_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/ +#{_kf5_metainfodir}/org.kde.breezedark.desktop.appdata.xml # no need for -devel pkg *just* for this %dir %{_libdir}/cmake/ %{_libdir}/cmake/Breeze/ %files common -f breeze.lang %{_datadir}/color-schemes/*.colors -%{_datadir}/QtCurve/Breeze.qtcurve +dir}/QtCurve/Breeze.qtcurve %{_datadir}/wallpapers/Next/ %if 0%{?build_kde4:1} @@ -182,6 +190,10 @@ fi %changelog +* Sun Sep 11 2016 Rex Dieter - 5.7.4-2 +- sort/simplify build deps (+BR: kf5-kwayland) +- make note of appdata/metainfo generation failure(s) in koji + * Tue Aug 23 2016 Rex Dieter - 5.7.4-1 - 5.7.4