From ca4e7629dc3c055f6f050ef383cf411af3425fac Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Jan 2016 13:09:53 -0600 Subject: [PATCH] 5.5.3-2 - .spec cosmetics - drop icon-related deps - breeze-cursor-theme: tighten %files, don't use %ghost, drop scriptlets - avoid kde4breeze.upd, causes problems for new users (#1283348) --- plasma-breeze.spec | 66 ++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/plasma-breeze.spec b/plasma-breeze.spec index 66ea6a7..dbc4b79 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -2,13 +2,13 @@ %global build_kde4 1 -Name: plasma-breeze +Name: plasma-breeze Version: 5.5.3 -Release: 1%{?dist} -Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop +Release: 2%{?dist} +Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop -License: GPLv2+ -URL: https://projects.kde.org/projects/kde/workspace/breeze +License: GPLv2+ +URL: https://projects.kde.org/breeze %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -18,6 +18,7 @@ URL: https://projects.kde.org/projects/kde/workspace/breeze %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz +BuildRequires: cmake BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: qt5-qtbase-devel @@ -97,7 +98,7 @@ make %{?_smp_mflags} -C %{_target_platform} %if 0%{?build_kde4:1} -mkdir -p %{_target_platform}_kde4 +mkdir %{_target_platform}_kde4 pushd %{_target_platform}_kde4 %{cmake_kde4} -DUSE_KDE4=TRUE .. popd @@ -114,16 +115,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform}_kde4 %endif -## icon optimizations -for theme in breeze_cursors Breeze_Snow; do -pushd %{buildroot}%{_datadir}/icons/${theme} -du -s . -time optimizegraphics ||: -du -s . -/usr/sbin/hardlink -c -v %{buildroot}%{_datadir}/icons/${theme} -du -s . -popd -done +# omit/rename kde4breeze.upd, seems to be causing problems for +# (at least) new users, lame workaround for +# http://bugzilla.redhat.com/1283348 +mv %{buildroot}%{_kf5_datadir}/kconf_update/kde4breeze.upd \ + %{buildroot}%{_kf5_datadir}/kconf_update/kde4breeze.upd.BAK %post @@ -139,16 +135,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : fi %files -%doc cursors/Breeze/README COPYING COPYING-ICONS +%license COPYING COPYING-ICONS %{_kf5_qtplugindir}/org.kde.kdecoration2/breezedecoration.so %{_kf5_qtplugindir}/styles/breeze.so %{_kf5_datadir}/kstyle/themes/breeze.themerc %{_kf5_qtplugindir}/kstyle_breeze_config.so -%{_kf5_datadir}/kconf_update/kde4breeze.upd +%{_kf5_datadir}/kconf_update/kde4breeze.upd* %{_kf5_libdir}/kconf_update_bin/kde4breeze %{_kf5_qmldir}/QtQuick/Controls/Styles/Breeze %{_bindir}/breeze-settings5 -%{_datadir}/icons/hicolor/scalable/apps/breeze-settings.svgz +%{_datadir}/icons/hicolor/*/apps/breeze-settings.* %{_kf5_datadir}/kservices5/breezedecorationconfig.desktop %{_kf5_datadir}/kservices5/breezestyleconfig.desktop %{_kf5_datadir}/kservices5/plasma-lookandfeel-org.kde.breezedark.desktop.desktop @@ -157,7 +153,7 @@ fi %files common -f breeze.lang %{_datadir}/color-schemes/*.colors %{_datadir}/QtCurve/Breeze.qtcurve -%{_datadir}/wallpapers/Next +%{_datadir}/wallpapers/Next/ %if 0%{?build_kde4:1} %files -n kde-style-breeze @@ -166,28 +162,22 @@ fi %{_kde4_appsdir}/kstyle/themes/breeze.themerc %endif -%post -n breeze-cursor-theme -touch --no-create %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/null || : - -%posttrans -n breeze-cursor-theme -gtk-update-icon-cache %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/null || : - -%postun -n breeze-cursor-theme -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/null || : -gtk-update-icon-cache %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/null || : -fi - %files -n breeze-cursor-theme -%{_kf5_datadir}/icons/Breeze_Snow -%ghost %{_kf5_datadir}/icons/Breeze_Snow/index.theme -%{_kf5_datadir}/icons/breeze_cursors -%ghost %{_kf5_datadir}/icons/breeze_cursors/index.theme +%doc cursors/Breeze/README +%dir %{_kf5_datadir}/icons/Breeze_Snow/ +%{_kf5_datadir}/icons/Breeze_Snow/cursors/ +%{_kf5_datadir}/icons/Breeze_Snow/index.theme +%dir %{_kf5_datadir}/icons/breeze_cursors/ +%{_kf5_datadir}/icons/breeze_cursors/cursors/ +%{_kf5_datadir}/icons/breeze_cursors/index.theme %changelog -* Thu Jan 07 2016 Daniel Vrátil - 5.5.3-1 -- Plasma 5.5.3 +* Fri Jan 08 2016 Rex Dieter - 5.5.3-2 +- .spec cosmetics +- drop icon-related deps +- breeze-cursor-theme: tighten %%files, don't use %%ghost, drop scriptlets +- avoid kde4breeze.upd, causes problems for new users (#1283348) * Thu Jan 07 2016 Daniel Vrátil - 5.5.3-1 - Plasma 5.5.3