diff --git a/breeze-icon-theme.spec b/breeze-icon-theme.spec index 5411035..cb9dac1 100644 --- a/breeze-icon-theme.spec +++ b/breeze-icon-theme.spec @@ -4,7 +4,7 @@ Name: breeze-icon-theme Summary: Breeze icon theme Version: 5.16.0 -Release: 1%{?dist} +Release: 2%{?dist} # http://techbase.kde.org/Policies/Licensing_Policy License: LGPLv3+ @@ -20,22 +20,33 @@ URL: http://projects.kde.org/breeze-icons Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/breeze-icons-%{version}.tar.xz BuildArch: noarch -BuildRequires: kf5-rpm-macros +Patch1: fix-breeze-dark-inheritance.patch + +BuildRequires: cmake BuildRequires: extra-cmake-modules +BuildRequires: kde-filesystem +BuildRequires: kf5-rpm-macros BuildRequires: qt5-qtbase-devel -BuildRequires: kde-filesystem +# icon optimizations +BuildRequires: hardlink +# for optimizegraphics +#BuildRequires: kde-dev-scripts +BuildRequires: time # upstream name Provides: breeze-icons = %{version}-%{release} Provides: kf5-breeze-icons = %{version}-%{release} +# upgrade path, since this no longer includes cursors +Requires: breeze-cursor-theme + %description %{summary}. %prep -%setup -q -n breeze-icons-%{version} +%autosetup -n breeze-icons-%{version} -p1 %build @@ -50,8 +61,12 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -# Note: we don't do optimizegraphics because breeze is exclusively SVG -# TODO: compress all SVG to SVGZ? +## icon optimizations +#du -s . +#time optimizegraphics ||: +du -s . +/usr/sbin/hardlink -c -v %{buildroot}%{_datadir}/icons/ +du -s . # create/own all potential dirs mkdir -p %{buildroot}%{_kf5_datadir}/icons/{breeze,breeze-dark}/{16x16,22x22,24x24,32x32,36x36,48x48,64x64,96x96,128x128,512x512,scalable}/{actions,apps,devices,mimetypes,places} @@ -60,6 +75,11 @@ mkdir -p %{buildroot}%{_kf5_datadir}/icons/{breeze,breeze-dark}/{16x16,22x22,24x touch %{buildroot}%{_kf5_datadir}/icons/{breeze,breeze-dark}/icon-theme.cache +%check +# verify dark inheritence, notorious for getting lost +test "$(grep '^Inherits=' %{buildroot}%{_datadir}/icons/breeze-dark/index.theme)" = "Inherits=breeze" + + %post touch --no-create %{_kf5_datadir}/icons/breeze &> /dev/null || : touch --no-create %{_kf5_datadir}/icons/breeze-dark &> /dev/null || : @@ -86,6 +106,11 @@ fi %changelog +* Sun Nov 15 2015 Rex Dieter - 5.16.0-2 +- Requires: breeze-cursor-theme (#1282203) +- use hardlink optimizer +- fix breeze dark inheritance (again) + * Sun Nov 08 2015 Daniel Vrátil - 5.16.0-1 - KDE Frameworks 5.16.0 diff --git a/fix-breeze-dark-inheritance.patch b/fix-breeze-dark-inheritance.patch new file mode 100644 index 0000000..e2523c7 --- /dev/null +++ b/fix-breeze-dark-inheritance.patch @@ -0,0 +1,13 @@ +diff --git a/icons-dark/index.theme b/icons-dark/index.theme +index 61660ba..d2f6767 100644 +--- a/icons-dark/index.theme ++++ b/icons-dark/index.theme +@@ -62,7 +62,7 @@ Comment[x-test]=xxDefault Plasma 5 Theme for Dark themesxx + + DisplayDepth=32 + +-Inherits=hicolor ++Inherits=breeze + + Example=folder +