diff --git a/plasma-breeze.spec b/plasma-breeze.spec index 5ebfc9a..11174f0 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -4,7 +4,7 @@ Name: plasma-breeze Version: 5.7.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop License: GPLv2+ @@ -38,6 +38,10 @@ BuildRequires: kf5-kwindowsystem-devel BuildRequires: kf5-plasma-devel BuildRequires: kf5-rpm-macros BuildRequires: libxcb-devel +%if ! 0%{?bootstrap} +# required kpackage plugins +BuildRequires: plasma-workspace-libs%{?_isa} >= %{majmin_ver} +%endif BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel @@ -120,16 +124,6 @@ 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 -#### -# see also https://bugs.kde.org/show_bug.cgi?id=368594 -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 @@ -163,7 +157,9 @@ 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 +%if ! 0%{?bootstrap} +%{_kf5_metainfodir}/org.kde.breezedark.desktop.appdata.xml +%endif # no need for -devel pkg *just* for this %dir %{_libdir}/cmake/ %{_libdir}/cmake/Breeze/ @@ -191,6 +187,9 @@ fi %changelog +* Sun Sep 11 2016 Rex Dieter - 5.7.4-3 +- BR: plasma-workspace-libs (kpackage plugins, kde#367923) + * 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