From cc55dc88791399c463a354bcf9cb1fce64242380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 25 Nov 2015 08:44:19 +0100 Subject: [PATCH] Plasma 5.4.95 --- .gitignore | 1 + plasma-breeze.spec | 72 +++++++++++++++------------------------------- sources | 2 +- 3 files changed, 25 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index d9de012..244e5a9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /breeze-5.4.1.tar.xz /breeze-5.4.2.tar.xz /breeze-5.4.3.tar.xz +/breeze-5.4.95.tar.xz diff --git a/plasma-breeze.spec b/plasma-breeze.spec index 3ee63ae..3796799 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -3,8 +3,8 @@ %global build_kde4 1 Name: plasma-breeze -Version: 5.4.3 -Release: 5%{?dist} +Version: 5.4.95 +Release: 1%{?dist} Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop License: GPLv2+ @@ -18,18 +18,14 @@ URL: https://projects.kde.org/projects/kde/workspace/breeze %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz -# This was accidentally broken by merge from breeze github repo in 5.4.2 while in 5.4.0 and 5.4.1 -# it was correct. Without this when you use breeze-dark you will be missing some icons because of -# wrong inheritance. -Patch1: fix-breeze-dark-inheritance.patch - BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel -BuildRequires: kf5-kservice-devel +BuildRequires: kf5-kservice-devel BuildRequires: kf5-kcmutils-devel +BuildRequires: kf5-plasma-devel # kde4breeze BuildRequires: kf5-kcoreaddons-devel @@ -48,10 +44,10 @@ BuildRequires: libxcb-devel BuildRequires: gettext # icon optimizations -BuildRequires: hardlink +BuildRequires: hardlink # for optimizegraphics -BuildRequires: kde-dev-scripts -BuildRequires: time +BuildRequires: kde-dev-scripts +BuildRequires: time Requires: kf5-filesystem @@ -74,13 +70,6 @@ Provides: breeze-cursor-themes = %{version}-%{release} %description -n breeze-cursor-theme %{summary}. -%package -n breeze-icon-theme -Summary: Breeze icon theme -BuildArch: noarch -Requires: breeze-cursor-theme = %{version}-%{release} -%description -n breeze-icon-theme -%{summary}. - %if 0%{?build_kde4:1} %package -n kde-style-breeze Summary: KDE 4 version of Plasma 5 artwork, style and assets @@ -137,10 +126,6 @@ popd done -%check -test "$(grep '^Inherits=' %{buildroot}%{_datadir}/icons/breeze-dark/index.theme)" = "Inherits=breeze" - - %post touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : @@ -161,19 +146,26 @@ fi %{_kf5_qtplugindir}/kstyle_breeze_config.so %{_kf5_datadir}/kconf_update/kde4breeze.upd %{_kf5_libdir}/kconf_update_bin/kde4breeze -%{_kf5_datadir}/kconf_update/gtkbreeze.upd -%{_kf5_libdir}/kconf_update_bin/gtkbreeze %{_kf5_qmldir}/QtQuick/Controls/Styles/Breeze %{_bindir}/breeze-settings5 %{_datadir}/icons/hicolor/scalable/apps/breeze-settings.svgz %{_kf5_datadir}/kservices5/breezedecorationconfig.desktop %{_kf5_datadir}/kservices5/breezestyleconfig.desktop +%{_kf5_datadir}/kservices5/plasma-lookandfeel-org.kde.breezedark.desktop.desktop +%{_kf5_datadir}/plasma/look-and-feel/org.kde.breezedark.desktop/ %files common -f breeze.lang %{_datadir}/color-schemes/*.colors %{_datadir}/QtCurve/Breeze.qtcurve %{_datadir}/wallpapers/Next +%if 0%{?build_kde4:1} +%files -n kde-style-breeze +%{_kde4_libdir}/kde4/plugins/styles/breeze.so +%{_kde4_libdir}/kde4/kstyle_breeze_config.so +%{_kde4_appsdir}/kstyle/themes/breeze.themerc +%endif + %post -n breeze-cursor-theme touch --no-create %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/null || : @@ -187,34 +179,16 @@ gtk-update-icon-cache %{_datadir}/icons/{breeze_cursors,Breeze_Snow} &> /dev/nul fi %files -n breeze-cursor-theme -%{_datadir}/icons/breeze_cursors/ -%{_datadir}/icons/Breeze_Snow/ - -%post -n breeze-icon-theme -touch --no-create %{_datadir}/icons/{breeze,breeze-dark} &> /dev/null || : - -%posttrans -n breeze-icon-theme -gtk-update-icon-cache %{_datadir}/icons/{breeze,breeze-dark} &> /dev/null || : - -%postun -n breeze-icon-theme -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/{breeze,breeze-dark} &> /dev/null || : -gtk-update-icon-cache %{_datadir}/icons/{breeze,breeze-dark} &> /dev/null || : -fi - -%files -n breeze-icon-theme -%{_datadir}/icons/breeze/ -%{_datadir}/icons/breeze-dark/ - -%if 0%{?build_kde4:1} -%files -n kde-style-breeze -%{_kde4_libdir}/kde4/plugins/styles/breeze.so -%{_kde4_libdir}/kde4/kstyle_breeze_config.so -%{_kde4_appsdir}/kstyle/themes/breeze.themerc -%endif +%{_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 %changelog +* Wed Nov 25 2015 Daniel Vrátil - 5.4.95-2 +- Plasma 5.4.95 + * Sun Nov 15 2015 Rex Dieter 5.4.3-5 - icon-theme/cursor theme: drop Requires: -common, add versioned Conflicts instead diff --git a/sources b/sources index f2cde5c..a5700cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a329faa7072537e789835cc4ef922ea8 breeze-5.4.3.tar.xz +1656f5183f2f1f773d84de947682f66e breeze-5.4.95.tar.xz