From 6647fbbe9abb19981189100ab0fefee022ce6247 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Oct 29 2020 15:53:35 +0000 Subject: drop kde-style-breeze (it was a lie), to be packaged separately now --- diff --git a/plasma-breeze.spec b/plasma-breeze.spec index fafa67d..7191f38 100644 --- a/plasma-breeze.spec +++ b/plasma-breeze.spec @@ -5,15 +5,9 @@ %global base_name breeze -# disable kde4 build on RHEL8+ -%global build_kde4 1 -%if 0%{?rhel} && 0%{?rhel} > 7 -%global build_kde4 0 -%endif - Name: plasma-breeze Version: 5.20.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Artwork, styles and assets for the Breeze visual style for the Plasma Desktop License: GPLv2+ @@ -30,7 +24,7 @@ URL: https://cgit.kde.org/%{base_name}.git Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz # filter plugin provides -%global __provides_exclude_from ^(%{_kde4_libdir}/kde4/.*\\.so|%{_kf5_qtplugindir}/.*\\.so)$ +%global __provides_exclude_from ^(%{_kf5_qtplugindir}/.*\\.so)$ BuildRequires: gettext BuildRequires: kdecoration-devel >= %{majmin_ver} @@ -89,37 +83,15 @@ Provides: breeze-cursor-themes = %{version}-%{release} %description -n breeze-cursor-theme %{summary}. -%if 0%{?build_kde4} -%package -n kde-style-breeze -Summary: KDE 4 version of Plasma 5 artwork, style and assets -BuildRequires: kdelibs4-devel -BuildRequires: libxcb-devel -## currently mostly plasma5-specific resources, not needed or useful here really -Obsoletes: plasma-breeze-kde4 < 5.1.95 -Provides: plasma-breeze-kde4%{?_isa} = %{version}-%{release} -%if 0 -Supplements: (kde-runtime and plasma-workspace) -%endif -%description -n kde-style-breeze -%{summary}. -%endif - %prep %autosetup -n %{base_name}-%{version} -p1 %build -%{cmake_kf5} -%cmake_build - +%cmake_kf5 -%if 0%{?build_kde4} -%global _vpath_builddir %{_target_platform}-kde4 -%{cmake_kde4} -DUSE_KDE4=TRUE -B %{_vpath_builddir} %cmake_build -%undefine _vpath_builddir -%endif %install @@ -127,18 +99,6 @@ Supplements: (kde-runtime and plasma-workspace) %find_lang breeze --all-name -%if 0%{?build_kde4} -%global _vpath_builddir %{_target_platform}-kde4 -%cmake_install -%undefine _vpath_builddir -%endif - -# 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 - %ldconfig_scriptlets @@ -170,16 +130,6 @@ mv %{buildroot}%{_kf5_datadir}/kconf_update/kde4breeze.upd \ %{_datadir}/QtCurve/Breeze.qtcurve %{_datadir}/wallpapers/Next/ -%if 0%{?build_kde4} -%ldconfig_scriptlets -n kde-style-breeze - -%files -n kde-style-breeze -%{_kde4_appsdir}/kstyle/themes/breeze.themerc -%{_datadir}/kde4/apps/QtCurve/Breeze.qtcurve -%{_datadir}/kde4/apps/color-schemes/*.colors -%{_datadir}/kde4/apps/plasma/look-and-feel/org.kde.breezedark.desktop/* -%endif - %files -n breeze-cursor-theme %doc cursors/Breeze/README %dir %{_kf5_datadir}/icons/Breeze_Snow/ @@ -191,6 +141,9 @@ mv %{buildroot}%{_kf5_datadir}/kconf_update/kde4breeze.upd \ %changelog +* Thu Oct 29 2020 Rex Dieter - 5.20.2-2 +- drop kde-style-breeze (it was a lie), to be packaged separately now + * Tue Oct 27 14:21:46 CET 2020 Jan Grulich - 5.20.2-1 - 5.20.2