From 154ba0fb7cd685ea3c7901ae1844d236a41e79bc3d4ddfb767c508eaf6e9a569 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 09:13:36 +0000 Subject: [PATCH 01/11] osc copypac from project:KDE:Unstable:Frameworks package:breeze revision:380 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=1 --- _service | 12 ++ ...e-5.7.90git~20160915T100423~92a5c79.tar.xz | 3 + _service:set_version:breeze.spec | 164 ++++++++++++++++++ _service:set_version:breeze4-style.spec | 56 ++++++ breeze-5.7.4.tar.xz | 3 - breeze-rpmlintrc | 2 + breeze.changes | 84 --------- breeze.spec | 28 ++- breeze4-style.changes | 141 --------------- breeze4-style.spec | 7 +- 10 files changed, 254 insertions(+), 246 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz create mode 100644 _service:set_version:breeze.spec create mode 100644 _service:set_version:breeze4-style.spec delete mode 100644 breeze-5.7.4.tar.xz create mode 100644 breeze-rpmlintrc diff --git a/_service b/_service new file mode 100644 index 0000000..7c4760e --- /dev/null +++ b/_service @@ -0,0 +1,12 @@ + + + git://anongit.kde.org/breeze.git + git + 5.7.90git~%ci~%h + + + *.tar + xz + + + \ No newline at end of file diff --git a/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz b/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz new file mode 100644 index 0000000..61b9121 --- /dev/null +++ b/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9780da86267535bf66d8113f16392fc7f51a10e3975c2926145a92c56cfd2b4 +size 33215028 diff --git a/_service:set_version:breeze.spec b/_service:set_version:breeze.spec new file mode 100644 index 0000000..095a32a --- /dev/null +++ b/_service:set_version:breeze.spec @@ -0,0 +1,164 @@ +# +# spec file for package breeze +# +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%bcond_without lang +Name: breeze +Version: 5.7.90git~20160915T100423~92a5c79 +Release: 0 +BuildRequires: cmake >= 2.8.12 +BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: hicolor-icon-theme +BuildRequires: kf5-filesystem +BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} +BuildRequires: cmake(KF5ConfigWidgets) +BuildRequires: cmake(KF5CoreAddons) +BuildRequires: cmake(KF5FrameworkIntegration) +BuildRequires: cmake(KF5GuiAddons) +BuildRequires: cmake(KF5I18n) +BuildRequires: cmake(KF5KCMUtils) +BuildRequires: cmake(KF5Package) +BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} +BuildRequires: cmake(KF5WindowSystem) +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xcb) +Requires: breeze5-cursors >= %{_plasma5_version} +Requires: breeze5-icons >= %{_plasma5_version} +Requires: breeze5-style >= %{_plasma5_version} +Requires: breeze5-wallpapers >= %{_plasma5_version} +Recommends: breeze5-decoration >= %{_plasma5_version} +Summary: Plasma Desktop artwork, styles and assets +License: GPL-2.0+ +Group: System/GUI/KDE +Url: http://www.kde.org +#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz +Source99: %{name}-rpmlintrc +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. + +%package -n breeze5-cursors +Summary: Plasma Desktop artwork, styles and assets +Group: System/GUI/KDE +BuildArch: noarch + +%description -n breeze5-cursors +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. +This package provides Breeze cursor theme. + +%package -n breeze5-style +Summary: Plasma Desktop artwork, styles and assets +Group: System/GUI/KDE +# needed for kde4breeze +Requires: breeze-gtk +Requires: kconf_update5 +Recommends: breeze4-style +%if %{with lang} +Recommends: breeze5-style-lang +%endif + +%description -n breeze5-style +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. +This package provides Breeze style, color-scheme and aditional assets. + +%package -n breeze5-wallpapers +Summary: Plasma Desktop artwork, styles and assets +Group: System/GUI/KDE +BuildArch: noarch + +%description -n breeze5-wallpapers +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. +This package provides Breeze wallpaper theme. + +%package -n breeze5-decoration +Summary: Plasma Desktop artwork, styles and assets +Group: System/GUI/KDE + +%description -n breeze5-decoration +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. +This package provides Breeze KWin decoration. + +%lang_package -n breeze5-style +%prep +%setup -q + +%build + %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %make_jobs + +%install + %kf5_makeinstall -C build + +%if %{with lang} +%files -n breeze5-style-lang +%defattr(-,root,root) +%doc COPYING* +%{_kf5_localedir}/ +%endif + +%files -n breeze5-cursors +%defattr(-,root,root) +%doc COPYING* +%{_kf5_iconsdir}/breeze_cursors +%{_kf5_iconsdir}/Breeze_Snow/ + +%files -n breeze5-style +%defattr(-,root,root) +%doc COPYING* +%{_kf5_bindir}/breeze-settings5 +%dir %{_kf5_iconsdir}/hicolor/scalable +%dir %{_kf5_iconsdir}/hicolor/scalable/apps +%{_kf5_iconsdir}/hicolor/scalable/apps/breeze-settings.* +%{_kf5_sharedir}/QtCurve/ +%{_kf5_sharedir}/color-schemes/ +%dir %{_kf5_sharedir}/plasma +%{_kf5_sharedir}/plasma/look-and-feel/ +%{_kf5_qmldir}/QtQuick/ +%{_kf5_libdir}/kconf_update_bin/ +%{_kf5_sharedir}/kconf_update/ +%dir %{_kf5_plugindir} +%{_kf5_plugindir}/kstyle_breeze_config.so +%{_kf5_plugindir}/styles/ +%{_kf5_sharedir}/kstyle/ +%dir %{_kf5_servicesdir} +%{_kf5_servicesdir}/breezestyleconfig.desktop +%{_kf5_libdir}/cmake/Breeze/ + +%files -n breeze5-wallpapers +%defattr(-,root,root) +%doc COPYING* +%dir %{_kf5_sharedir}/wallpapers +%{_kf5_sharedir}/wallpapers/Next/ + +%files -n breeze5-decoration +%defattr(-,root,root) +%doc COPYING* +%dir %{_kf5_plugindir} +%{_kf5_plugindir}/org.kde.kdecoration2/ +%dir %{_kf5_servicesdir} +%{_kf5_servicesdir}/breezedecorationconfig.desktop + +%files +%defattr(-,root,root) +%doc COPYING* + +%changelog diff --git a/_service:set_version:breeze4-style.spec b/_service:set_version:breeze4-style.spec new file mode 100644 index 0000000..e79d8f0 --- /dev/null +++ b/_service:set_version:breeze4-style.spec @@ -0,0 +1,56 @@ +# +# spec file for package breeze4-style +# +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: breeze4-style +Version: 5.7.90git~20160915T100423~92a5c79 +Release: 0 +BuildRequires: automoc4 +BuildRequires: cmake >= 2.8.12 +BuildRequires: kde4-filesystem +BuildRequires: libkde4-devel +BuildRequires: libqt4-devel +BuildRequires: libxcb-devel +Summary: Plasma Desktop artwork, styles and assets +License: GPL-2.0+ +Group: System/GUI/KDE +Url: http://www.kde.org +#Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +Source: breeze-%{version}.tar.xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. +This package contains kde4 backport of new default Plasma 5 style. + +%prep +%setup -q -n breeze-%{version} + +%build + %cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON + %make_jobs + +%install + %kde4_makeinstall -C build + +%files +%defattr(-,root,root) +%doc COPYING* +%{_kde4_modulesdir}/ +%{_kde4_appsdir}/ + +%changelog diff --git a/breeze-5.7.4.tar.xz b/breeze-5.7.4.tar.xz deleted file mode 100644 index 5c75177..0000000 --- a/breeze-5.7.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0695f02b068a72760e9b2a0802820c32fd4627c7d0af14f8b43dcc7f905d4c6a -size 12514540 diff --git a/breeze-rpmlintrc b/breeze-rpmlintrc new file mode 100644 index 0000000..cc4ae51 --- /dev/null +++ b/breeze-rpmlintrc @@ -0,0 +1,2 @@ +# we don't use find_lang macro as it doesn't searches in subdirectories +addFilter("file-not-in-%lang .*") \ No newline at end of file diff --git a/breeze.changes b/breeze.changes index f540c31..d86be1b 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,87 +1,3 @@ -------------------------------------------------------------------- -Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de - -- Update to 5.7.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.4.php - -------------------------------------------------------------------- -Tue Aug 2 11:35:49 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.3.php - -------------------------------------------------------------------- -Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.2.php - -------------------------------------------------------------------- -Mon Jul 18 08:38:22 UTC 2016 - jengelh@inai.de - -- Add fdupes by recommendation of rpmlint - -------------------------------------------------------------------- -Wed Jul 13 06:13:22 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.1.php - -------------------------------------------------------------------- -Tue Jul 5 11:11:55 UTC 2016 - wbauer@tmo.at - -- Use the new %kf5_find_lang macro to create the file list for the - lang package -- Remove rpmlintrc file, it is not needed any more now - -------------------------------------------------------------------- -Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.0.php - -------------------------------------------------------------------- -Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.4.php - -------------------------------------------------------------------- -Tue Apr 19 20:45:25 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.3.php - -------------------------------------------------------------------- -Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.2.php - -------------------------------------------------------------------- -Tue Mar 29 16:20:33 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.1.php - ------------------------------------------------------------------- Sun Mar 20 09:19:46 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/breeze.spec b/breeze.spec index 90b8d86..e0b81c5 100644 --- a/breeze.spec +++ b/breeze.spec @@ -18,14 +18,13 @@ %bcond_without lang Name: breeze -Version: 5.7.4 +Version: 5.6.0 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 -BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem -BuildRequires: cmake(KDecoration2) >= %{version} +BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5FrameworkIntegration) @@ -33,24 +32,25 @@ BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) -Requires: breeze5-cursors >= %{version} -Requires: breeze5-icons >= %{version} -Requires: breeze5-style >= %{version} -Requires: breeze5-wallpapers >= %{version} -Recommends: breeze5-decoration >= %{version} +Requires: breeze5-cursors >= %{_plasma5_version} +Requires: breeze5-icons >= %{_plasma5_version} +Requires: breeze5-style >= %{_plasma5_version} +Requires: breeze5-wallpapers >= %{_plasma5_version} +Recommends: breeze5-decoration >= %{_plasma5_version} Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org #Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz +Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -102,19 +102,17 @@ This package provides Breeze KWin decoration. %setup -q %build - %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 %make_jobs %install %kf5_makeinstall -C build -%if %{with lang} - %kf5_find_lang -%endif -%fdupes %buildroot/%_prefix %if %{with lang} -%files -n breeze5-style-lang -f %{name}.lang +%files -n breeze5-style-lang +%defattr(-,root,root) %doc COPYING* +%{_kf5_localedir}/ %endif %files -n breeze5-cursors diff --git a/breeze4-style.changes b/breeze4-style.changes index be7cda5..13c5c16 100644 --- a/breeze4-style.changes +++ b/breeze4-style.changes @@ -1,144 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 2 11:35:49 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.3.php - -------------------------------------------------------------------- -Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.2.php - -------------------------------------------------------------------- -Wed Jul 13 06:13:22 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.1.php - -------------------------------------------------------------------- -Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.7.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.7.0.php - -------------------------------------------------------------------- -Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.4 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.4.php - -------------------------------------------------------------------- -Tue Apr 19 20:45:25 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.3 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.3.php - -------------------------------------------------------------------- -Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.2 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.2.php - -------------------------------------------------------------------- -Tue Mar 29 16:20:33 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.1 - * New bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.1.php - -------------------------------------------------------------------- -Sun Mar 20 09:19:46 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.6.0 - * New feature release - * For more details please see: - https://www.kde.org/announcements/plasma-5.6.0.php - -------------------------------------------------------------------- -Tue Mar 1 17:31:44 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.5.5 (boo#968966) - * Bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.5.5.php - -------------------------------------------------------------------- -Tue Jan 26 22:20:05 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.5.4: - * Bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.5.4.php - -------------------------------------------------------------------- -Wed Jan 6 14:12:02 UTC 2016 - hrvoje.senjan@gmail.com - -- Update to 5.5.3: - * Bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.5.3.php - -------------------------------------------------------------------- -Tue Dec 22 22:35:02 UTC 2015 - hrvoje.senjan@gmail.com - -- Update to 5.5.2: - * Bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.5.2.php - -------------------------------------------------------------------- -Tue Dec 15 17:49:47 UTC 2015 - hrvoje.senjan@gmail.com - -- Update to 5.5.1: - * Bugfix release - * For more details please see: - https://www.kde.org/announcements/plasma-5.5.1.php - -------------------------------------------------------------------- -Sat Dec 12 17:31:02 UTC 2015 - hrvoje.senjan@gmail.com - -- Update to 5.5.0: - * For more details please see: - https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork -- Move to cmake(...) BuildRequires where possible - -------------------------------------------------------------------- -Sun Nov 8 18:09:42 UTC 2015 - hrvoje.senjan@gmail.com - -- Update to 5.4.3 (boo#955068): - * For more details please see: - https://www.kde.org/announcements/plasma-5.4.3.php -. Drop Use-NETRootInfo-to-initiate-wm-move-operation.patch, upstreamed - -------------------------------------------------------------------- -Sat Oct 10 13:52:44 UTC 2015 - hrvoje.senjan@gmail.com - -- Added Use-NETRootInfo-to-initiate-wm-move-operation.patch - (kde#353749) - -------------------------------------------------------------------- -Sun Oct 4 10:43:28 UTC 2015 - hrvoje.senjan@gmail.com - -- Update to 5.4.2: - * For more details please see: - https://www.kde.org/announcements/plasma-5.4.2.php - ------------------------------------------------------------------- Tue Sep 8 18:39:33 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/breeze4-style.spec b/breeze4-style.spec index e65264b..e7da56a 100644 --- a/breeze4-style.spec +++ b/breeze4-style.spec @@ -1,7 +1,7 @@ # # spec file for package breeze4-style # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.7.4 +Version: 5.4.0 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 @@ -29,7 +29,8 @@ Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +#Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz +Source: breeze-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From e8148d7356201391feb9fb6e11cd0d3e634dfe89f1f80f063d4234152b8b5cb5 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 17:10:35 +0000 Subject: [PATCH 02/11] Update to Plasma 5.7.95 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=2 --- _service | 12 -- ...e-5.7.90git~20160915T100423~92a5c79.tar.xz | 3 - _service:set_version:breeze.spec | 164 ------------------ _service:set_version:breeze4-style.spec | 56 ------ breeze-5.7.95.tar.xz | 3 + breeze.changes | 100 +++++++++++ breeze.spec | 6 +- breeze4-style.spec | 2 +- 8 files changed, 107 insertions(+), 239 deletions(-) delete mode 100644 _service delete mode 100644 _service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz delete mode 100644 _service:set_version:breeze.spec delete mode 100644 _service:set_version:breeze4-style.spec create mode 100644 breeze-5.7.95.tar.xz diff --git a/_service b/_service deleted file mode 100644 index 7c4760e..0000000 --- a/_service +++ /dev/null @@ -1,12 +0,0 @@ - - - git://anongit.kde.org/breeze.git - git - 5.7.90git~%ci~%h - - - *.tar - xz - - - \ No newline at end of file diff --git a/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz b/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz deleted file mode 100644 index 61b9121..0000000 --- a/_service:recompress:tar_scm:breeze-5.7.90git~20160915T100423~92a5c79.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f9780da86267535bf66d8113f16392fc7f51a10e3975c2926145a92c56cfd2b4 -size 33215028 diff --git a/_service:set_version:breeze.spec b/_service:set_version:breeze.spec deleted file mode 100644 index 095a32a..0000000 --- a/_service:set_version:breeze.spec +++ /dev/null @@ -1,164 +0,0 @@ -# -# spec file for package breeze -# -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%bcond_without lang -Name: breeze -Version: 5.7.90git~20160915T100423~92a5c79 -Release: 0 -BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 0.0.13 -BuildRequires: hicolor-icon-theme -BuildRequires: kf5-filesystem -BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5FrameworkIntegration) -BuildRequires: cmake(KF5GuiAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5KCMUtils) -BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} -BuildRequires: cmake(KF5WindowSystem) -BuildRequires: cmake(Qt5DBus) >= 5.4.0 -BuildRequires: cmake(Qt5Widgets) >= 5.4.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 -BuildRequires: pkgconfig(x11-xcb) -BuildRequires: pkgconfig(xcb) -Requires: breeze5-cursors >= %{_plasma5_version} -Requires: breeze5-icons >= %{_plasma5_version} -Requires: breeze5-style >= %{_plasma5_version} -Requires: breeze5-wallpapers >= %{_plasma5_version} -Recommends: breeze5-decoration >= %{_plasma5_version} -Summary: Plasma Desktop artwork, styles and assets -License: GPL-2.0+ -Group: System/GUI/KDE -Url: http://www.kde.org -#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz -Source: %{name}-%{version}.tar.xz -Source99: %{name}-rpmlintrc -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. - -%package -n breeze5-cursors -Summary: Plasma Desktop artwork, styles and assets -Group: System/GUI/KDE -BuildArch: noarch - -%description -n breeze5-cursors -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. -This package provides Breeze cursor theme. - -%package -n breeze5-style -Summary: Plasma Desktop artwork, styles and assets -Group: System/GUI/KDE -# needed for kde4breeze -Requires: breeze-gtk -Requires: kconf_update5 -Recommends: breeze4-style -%if %{with lang} -Recommends: breeze5-style-lang -%endif - -%description -n breeze5-style -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. -This package provides Breeze style, color-scheme and aditional assets. - -%package -n breeze5-wallpapers -Summary: Plasma Desktop artwork, styles and assets -Group: System/GUI/KDE -BuildArch: noarch - -%description -n breeze5-wallpapers -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. -This package provides Breeze wallpaper theme. - -%package -n breeze5-decoration -Summary: Plasma Desktop artwork, styles and assets -Group: System/GUI/KDE - -%description -n breeze5-decoration -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. -This package provides Breeze KWin decoration. - -%lang_package -n breeze5-style -%prep -%setup -q - -%build - %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 - %make_jobs - -%install - %kf5_makeinstall -C build - -%if %{with lang} -%files -n breeze5-style-lang -%defattr(-,root,root) -%doc COPYING* -%{_kf5_localedir}/ -%endif - -%files -n breeze5-cursors -%defattr(-,root,root) -%doc COPYING* -%{_kf5_iconsdir}/breeze_cursors -%{_kf5_iconsdir}/Breeze_Snow/ - -%files -n breeze5-style -%defattr(-,root,root) -%doc COPYING* -%{_kf5_bindir}/breeze-settings5 -%dir %{_kf5_iconsdir}/hicolor/scalable -%dir %{_kf5_iconsdir}/hicolor/scalable/apps -%{_kf5_iconsdir}/hicolor/scalable/apps/breeze-settings.* -%{_kf5_sharedir}/QtCurve/ -%{_kf5_sharedir}/color-schemes/ -%dir %{_kf5_sharedir}/plasma -%{_kf5_sharedir}/plasma/look-and-feel/ -%{_kf5_qmldir}/QtQuick/ -%{_kf5_libdir}/kconf_update_bin/ -%{_kf5_sharedir}/kconf_update/ -%dir %{_kf5_plugindir} -%{_kf5_plugindir}/kstyle_breeze_config.so -%{_kf5_plugindir}/styles/ -%{_kf5_sharedir}/kstyle/ -%dir %{_kf5_servicesdir} -%{_kf5_servicesdir}/breezestyleconfig.desktop -%{_kf5_libdir}/cmake/Breeze/ - -%files -n breeze5-wallpapers -%defattr(-,root,root) -%doc COPYING* -%dir %{_kf5_sharedir}/wallpapers -%{_kf5_sharedir}/wallpapers/Next/ - -%files -n breeze5-decoration -%defattr(-,root,root) -%doc COPYING* -%dir %{_kf5_plugindir} -%{_kf5_plugindir}/org.kde.kdecoration2/ -%dir %{_kf5_servicesdir} -%{_kf5_servicesdir}/breezedecorationconfig.desktop - -%files -%defattr(-,root,root) -%doc COPYING* - -%changelog diff --git a/_service:set_version:breeze4-style.spec b/_service:set_version:breeze4-style.spec deleted file mode 100644 index e79d8f0..0000000 --- a/_service:set_version:breeze4-style.spec +++ /dev/null @@ -1,56 +0,0 @@ -# -# spec file for package breeze4-style -# -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -Name: breeze4-style -Version: 5.7.90git~20160915T100423~92a5c79 -Release: 0 -BuildRequires: automoc4 -BuildRequires: cmake >= 2.8.12 -BuildRequires: kde4-filesystem -BuildRequires: libkde4-devel -BuildRequires: libqt4-devel -BuildRequires: libxcb-devel -Summary: Plasma Desktop artwork, styles and assets -License: GPL-2.0+ -Group: System/GUI/KDE -Url: http://www.kde.org -#Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz -Source: breeze-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%description -Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. -This package contains kde4 backport of new default Plasma 5 style. - -%prep -%setup -q -n breeze-%{version} - -%build - %cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON - %make_jobs - -%install - %kde4_makeinstall -C build - -%files -%defattr(-,root,root) -%doc COPYING* -%{_kde4_modulesdir}/ -%{_kde4_appsdir}/ - -%changelog diff --git a/breeze-5.7.95.tar.xz b/breeze-5.7.95.tar.xz new file mode 100644 index 0000000..f241179 --- /dev/null +++ b/breeze-5.7.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07beea6e26040e18a673f3a3e46e02a3c5aafba68206c25a2ddaf379a1c2b856 +size 33277632 diff --git a/breeze.changes b/breeze.changes index d86be1b..be9c220 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,103 @@ +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Tue Aug 2 11:35:49 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.3.php + +------------------------------------------------------------------- +Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.2.php + +------------------------------------------------------------------- +Mon Jul 18 08:38:22 UTC 2016 - jengelh@inai.de + +- Add fdupes by recommendation of rpmlint + +------------------------------------------------------------------- +Wed Jul 13 06:13:22 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.1.php + +------------------------------------------------------------------- +Tue Jul 5 11:11:55 UTC 2016 - wbauer@tmo.at + +- Use the new %kf5_find_lang macro to create the file list for the + lang package +- Remove rpmlintrc file, it is not needed any more now + +------------------------------------------------------------------- +Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.0.php + +------------------------------------------------------------------- +Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.4.php + +------------------------------------------------------------------- +Tue Apr 19 20:45:25 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.3.php + +------------------------------------------------------------------- +Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php + +------------------------------------------------------------------- +Tue Mar 29 16:20:33 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.1.php + ------------------------------------------------------------------- Sun Mar 20 09:19:46 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/breeze.spec b/breeze.spec index e0b81c5..dd0a70c 100644 --- a/breeze.spec +++ b/breeze.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: breeze -Version: 5.6.0 +Version: 5.7.95 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 @@ -48,8 +48,8 @@ Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz -Source: %{name}-%{version}.tar.xz +#Source: http://download.kde.org/unstable/plasma/%{version}/http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz +Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build diff --git a/breeze4-style.spec b/breeze4-style.spec index e7da56a..0b4a2d4 100644 --- a/breeze4-style.spec +++ b/breeze4-style.spec @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.4.0 +Version: 5.7.95 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 From 535878cf321512912c1fb59488c1179631f0914f98ae31c71594bed375f0ffa8 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 15 Sep 2016 19:40:47 +0000 Subject: [PATCH 03/11] Use kf5_find_lang everywhere OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=3 --- breeze.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/breeze.spec b/breeze.spec index dd0a70c..e6a94b6 100644 --- a/breeze.spec +++ b/breeze.spec @@ -22,6 +22,7 @@ Version: 5.7.95 Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 +BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} @@ -48,7 +49,6 @@ Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -#Source: http://download.kde.org/unstable/plasma/%{version}/http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -102,17 +102,19 @@ This package provides Breeze KWin decoration. %setup -q %build - %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 + %cmake_kf5 -d build -- -DBUILD_po=OFF -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install %kf5_makeinstall -C build +%if %{with lang} + %kf5_find_lang +%endif +%fdupes %buildroot/%_prefix %if %{with lang} -%files -n breeze5-style-lang -%defattr(-,root,root) +%files -n breeze5-style-lang -f %{name}.lang %doc COPYING* -%{_kf5_localedir}/ %endif %files -n breeze5-cursors From a2682c721ca325b95ea4b8b8290efbc2dfdec02e5678ef676b8a1808a347c6f9 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 17 Sep 2016 17:51:55 +0000 Subject: [PATCH 04/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=4 --- breeze4-style.changes | 165 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) diff --git a/breeze4-style.changes b/breeze4-style.changes index 13c5c16..580a7c5 100644 --- a/breeze4-style.changes +++ b/breeze4-style.changes @@ -1,3 +1,168 @@ +------------------------------------------------------------------- +Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.95 (Plasma 5.8 Beta) + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.95.php + +------------------------------------------------------------------- +Tue Sep 13 17:42:09 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.5 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.5.php + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Tue Aug 2 11:35:49 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.3.php + +------------------------------------------------------------------- +Wed Jul 20 08:54:14 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.2.php + +------------------------------------------------------------------- +Wed Jul 13 06:13:22 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.1.php + +------------------------------------------------------------------- +Thu Jun 30 12:02:17 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.7.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.0.php + +------------------------------------------------------------------- +Sun May 15 16:50:10 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.4.php + +------------------------------------------------------------------- +Tue Apr 19 20:45:25 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.3 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.3.php + +------------------------------------------------------------------- +Tue Apr 5 15:53:41 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.2 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.2.php + +------------------------------------------------------------------- +Tue Mar 29 16:20:33 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.1 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.1.php + +------------------------------------------------------------------- +Sun Mar 20 09:19:46 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.6.0 + * New feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.6.0.php + +------------------------------------------------------------------- +Tue Mar 1 17:31:44 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.5.5 (boo#968966) + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.5.php + +------------------------------------------------------------------- +Tue Jan 26 22:20:05 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.5.4: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.4.php + +------------------------------------------------------------------- +Wed Jan 6 14:12:02 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.5.3: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.3.php + +------------------------------------------------------------------- +Tue Dec 22 22:35:02 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.2: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.2.php + +------------------------------------------------------------------- +Tue Dec 15 17:49:47 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.1: + * Bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.5.1.php + +------------------------------------------------------------------- +Sat Dec 12 17:31:02 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.5.0: + * For more details please see: + https://dot.kde.org/2015/12/08/plasma-55-beautiful-new-artwork +- Move to cmake(...) BuildRequires where possible + +------------------------------------------------------------------- +Sun Nov 8 18:09:42 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.3 (boo#955068): + * For more details please see: + https://www.kde.org/announcements/plasma-5.4.3.php +. Drop Use-NETRootInfo-to-initiate-wm-move-operation.patch, upstreamed + +------------------------------------------------------------------- +Sat Oct 10 13:52:44 UTC 2015 - hrvoje.senjan@gmail.com + +- Added Use-NETRootInfo-to-initiate-wm-move-operation.patch + (kde#353749) + +------------------------------------------------------------------- +Sun Oct 4 10:43:28 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.4.2: + * For more details please see: + https://www.kde.org/announcements/plasma-5.4.2.php + ------------------------------------------------------------------- Tue Sep 8 18:39:33 UTC 2015 - hrvoje.senjan@gmail.com From b08ffc19ee19a08fbedb3a3d0d45b6eb7cabb7147bc4b87784efe9cdca1f77d1 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 17 Sep 2016 17:55:51 +0000 Subject: [PATCH 05/11] Use the right, existing macro OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=5 --- breeze.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/breeze.spec b/breeze.spec index e6a94b6..353d601 100644 --- a/breeze.spec +++ b/breeze.spec @@ -25,7 +25,7 @@ BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem -BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} +BuildRequires: cmake(KDecoration2) >= %{version} BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5FrameworkIntegration) @@ -33,18 +33,18 @@ BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} +BuildRequires: cmake(KF5Wayland) >= %{version} BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xcb) -Requires: breeze5-cursors >= %{_plasma5_version} -Requires: breeze5-icons >= %{_plasma5_version} -Requires: breeze5-style >= %{_plasma5_version} -Requires: breeze5-wallpapers >= %{_plasma5_version} -Recommends: breeze5-decoration >= %{_plasma5_version} +Requires: breeze5-cursors >= %{version} +Requires: breeze5-icons >= %{version} +Requires: breeze5-style >= %{version} +Requires: breeze5-wallpapers >= %{version} +Recommends: breeze5-decoration >= %{version} Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE From 0f5953efd4f9dee5d173f94c8b19e72fd31221e7fa92e196d1ab152df26fc810 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 17 Sep 2016 18:38:14 +0000 Subject: [PATCH 06/11] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=6 --- breeze-rpmlintrc | 2 -- breeze.spec | 1 - 2 files changed, 3 deletions(-) delete mode 100644 breeze-rpmlintrc diff --git a/breeze-rpmlintrc b/breeze-rpmlintrc deleted file mode 100644 index cc4ae51..0000000 --- a/breeze-rpmlintrc +++ /dev/null @@ -1,2 +0,0 @@ -# we don't use find_lang macro as it doesn't searches in subdirectories -addFilter("file-not-in-%lang .*") \ No newline at end of file diff --git a/breeze.spec b/breeze.spec index 353d601..754f794 100644 --- a/breeze.spec +++ b/breeze.spec @@ -50,7 +50,6 @@ License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz -Source99: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From 97b8c1c5ceb2d9523315caa33e3b0fe2bed866073c1259f0ce7cffc9f5d87483 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 21 Sep 2016 16:38:58 +0000 Subject: [PATCH 07/11] Make it possible to reuse spec files for KUF again OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=7 --- breeze.changes | 5 +++++ breeze.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/breeze.changes b/breeze.changes index be9c220..e4f7136 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 21 09:15:37 UTC 2016 - fabian@ritter-vogt.de + +- Use %{_plasma5_version} again, define it if needed + ------------------------------------------------------------------- Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de diff --git a/breeze.spec b/breeze.spec index 754f794..4d3ea0c 100644 --- a/breeze.spec +++ b/breeze.spec @@ -19,13 +19,14 @@ %bcond_without lang Name: breeze Version: 5.7.95 +%{!?_plasma5_version: %global _plasma5_version %{version}} Release: 0 BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: kf5-filesystem -BuildRequires: cmake(KDecoration2) >= %{version} +BuildRequires: cmake(KDecoration2) >= %{_plasma5_version} BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5FrameworkIntegration) @@ -33,7 +34,7 @@ BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5Package) -BuildRequires: cmake(KF5Wayland) >= %{version} +BuildRequires: cmake(KF5Wayland) >= %{_plasma5_version} BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Widgets) >= 5.4.0 From 5b9622042a5e75f9417d6771731122d1bd24b9daf0cb01cb5836e899a409c909 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 29 Sep 2016 19:39:02 +0000 Subject: [PATCH 08/11] Move %_plasma5_version to match K:F5 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=8 --- breeze.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/breeze.spec b/breeze.spec index 4d3ea0c..e02ede2 100644 --- a/breeze.spec +++ b/breeze.spec @@ -19,8 +19,8 @@ %bcond_without lang Name: breeze Version: 5.7.95 -%{!?_plasma5_version: %global _plasma5_version %{version}} Release: 0 +%{!?_plasma5_version: %global _plasma5_version %{version}} BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 0.0.13 BuildRequires: fdupes From 3706d77ba346501b1169d76b94ac10b4eaf03ccbc08d6c3b91384fe4d971ed4c Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Sat, 1 Oct 2016 22:15:08 +0000 Subject: [PATCH 09/11] Accepting request 432185 from home:Vogtinator:branches:KDE:Frameworks5:LTS OBS-URL: https://build.opensuse.org/request/show/432185 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=9 --- breeze-5.7.95.tar.xz | 3 --- breeze-5.8.0.tar.xz | 3 +++ breeze.changes | 8 ++++++++ breeze.spec | 2 +- breeze4-style.changes | 8 ++++++++ breeze4-style.spec | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) delete mode 100644 breeze-5.7.95.tar.xz create mode 100644 breeze-5.8.0.tar.xz diff --git a/breeze-5.7.95.tar.xz b/breeze-5.7.95.tar.xz deleted file mode 100644 index f241179..0000000 --- a/breeze-5.7.95.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07beea6e26040e18a673f3a3e46e02a3c5aafba68206c25a2ddaf379a1c2b856 -size 33277632 diff --git a/breeze-5.8.0.tar.xz b/breeze-5.8.0.tar.xz new file mode 100644 index 0000000..b1a1211 --- /dev/null +++ b/breeze-5.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1630c6cacced9c48b697aa78a406d0d7c3aa46fc164150636dc07f760dde853c +size 33277480 diff --git a/breeze.changes b/breeze.changes index e4f7136..03870be 100644 --- a/breeze.changes +++ b/breeze.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + ------------------------------------------------------------------- Wed Sep 21 09:15:37 UTC 2016 - fabian@ritter-vogt.de diff --git a/breeze.spec b/breeze.spec index e02ede2..574e439 100644 --- a/breeze.spec +++ b/breeze.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: breeze -Version: 5.7.95 +Version: 5.8.0 Release: 0 %{!?_plasma5_version: %global _plasma5_version %{version}} BuildRequires: cmake >= 2.8.12 diff --git a/breeze4-style.changes b/breeze4-style.changes index 580a7c5..4cd58b1 100644 --- a/breeze4-style.changes +++ b/breeze4-style.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de + +- Update to 5.8.0 + * New LTS feature release + * For more details please see: + https://www.kde.org/announcements/plasma-5.8.0.php + ------------------------------------------------------------------- Thu Sep 15 15:53:55 UTC 2016 - fabian@ritter-vogt.de diff --git a/breeze4-style.spec b/breeze4-style.spec index 0b4a2d4..e15e2f8 100644 --- a/breeze4-style.spec +++ b/breeze4-style.spec @@ -17,7 +17,7 @@ Name: breeze4-style -Version: 5.7.95 +Version: 5.8.0 Release: 0 BuildRequires: automoc4 BuildRequires: cmake >= 2.8.12 From 99aa1eeb20d041f2ad7bf7cb90f127db9e5098b83cc5555ba218390bbf705fcc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 2 Oct 2016 08:45:22 +0000 Subject: [PATCH 10/11] Remove source URLs temporarily OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=10 --- breeze.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/breeze.spec b/breeze.spec index 574e439..52cbd36 100644 --- a/breeze.spec +++ b/breeze.spec @@ -50,7 +50,7 @@ Summary: Plasma Desktop artwork, styles and assets License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org -Source: http://download.kde.org/unstable/plasma/%{version}/%{name}-%{version}.tar.xz +Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description From 1b40ac8fc9e93c5429b1cb85acfb5ecf3809903e18faa096d9170177a1266f80 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 2 Oct 2016 12:10:31 +0000 Subject: [PATCH 11/11] Accepting request 432456 from home:wolfi323:branches:KDE:Frameworks5:LTS - Add add-support-for-Q3ListView-to-the-KDE4-style.patch to fix the display of the collapse/expand icon in Q3ListView that still may be used by some KDE4 applications, knode e.g. (boo#973728) OBS-URL: https://build.opensuse.org/request/show/432456 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/breeze?expand=0&rev=11 --- ...ort-for-Q3ListView-to-the-KDE4-style.patch | 88 +++++++++++++++++++ breeze4-style.changes | 7 ++ breeze4-style.spec | 3 + 3 files changed, 98 insertions(+) create mode 100644 add-support-for-Q3ListView-to-the-KDE4-style.patch diff --git a/add-support-for-Q3ListView-to-the-KDE4-style.patch b/add-support-for-Q3ListView-to-the-KDE4-style.patch new file mode 100644 index 0000000..641405f --- /dev/null +++ b/add-support-for-Q3ListView-to-the-KDE4-style.patch @@ -0,0 +1,88 @@ +diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp +index 8a02d75..359d1ab 100644 +--- a/kstyle/breezestyle.cpp ++++ b/kstyle/breezestyle.cpp +@@ -929,6 +929,7 @@ namespace Breeze + case CC_ToolButton: fcn = &Style::drawToolButtonComplexControl; break; + case CC_ComboBox: fcn = &Style::drawComboBoxComplexControl; break; + case CC_SpinBox: fcn = &Style::drawSpinBoxComplexControl; break; ++ case CC_Q3ListView: fcn = &Style::drawQ3ListViewComplexControl; break; + case CC_Slider: fcn = &Style::drawSliderComplexControl; break; + case CC_Dial: fcn = &Style::drawDialComplexControl; break; + case CC_ScrollBar: fcn = &Style::drawScrollBarComplexControl; break; +@@ -6122,6 +6123,63 @@ namespace Breeze + } + + //______________________________________________________________ ++ bool Style::drawQ3ListViewComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const ++ { ++ ++ const QStyleOptionQ3ListView* optListView( qstyleoption_cast( option ) ); ++ if( !optListView ) return true; ++ ++ // this is copied from skulpture code ++ // Copyright ( c ) 2007-2010 Christoph Feck ++ if( optListView->subControls & QStyle::SC_Q3ListView ) ++ { ++ painter->fillRect( ++ optListView->rect, ++ optListView->viewportPalette.brush( optListView->viewportBGRole ) ); ++ } ++ ++ if( optListView->subControls & QStyle::SC_Q3ListViewBranch ) ++ { ++ ++ QStyleOption opt = *static_cast( option ); ++ int y = optListView->rect.y(); ++ ++ for ( int i = 1; i < optListView->items.size(); ++i ) ++ { ++ QStyleOptionQ3ListViewItem item = optListView->items.at( i ); ++ if( y + item.totalHeight > 0 && y < optListView->rect.height() ) ++ { ++ opt.state = QStyle::State_Item; ++ if ( i + 1 < optListView->items.size() ) ++ { opt.state |= QStyle::State_Sibling; } ++ ++ if( ++ item.features & QStyleOptionQ3ListViewItem::Expandable ++ || ( item.childCount > 0 && item.height > 0 ) ) ++ { opt.state |= QStyle::State_Children | ( item.state & QStyle::State_Open ); } ++ ++ opt.rect = QRect( optListView->rect.left(), y, optListView->rect.width(), item.height ); ++ drawIndicatorBranchPrimitive( &opt, painter, widget ); ++ ++ if( ( opt.state & QStyle::State_Sibling ) && item.height < item.totalHeight ) ++ { ++ opt.state = QStyle::State_Sibling; ++ opt.rect = QRect( ++ optListView->rect.left(), y + item.height, ++ optListView->rect.width(), item.totalHeight - item.height ); ++ drawIndicatorBranchPrimitive( &opt, painter, widget ); ++ } ++ } ++ ++ y += item.totalHeight; ++ } ++ } ++ ++ return true; ++ ++ } ++ ++ //______________________________________________________________ + bool Style::drawSliderComplexControl( const QStyleOptionComplex* option, QPainter* painter, const QWidget* widget ) const + { + +diff --git a/kstyle/breezestyle.h b/kstyle/breezestyle.h +index a627252..dcbfe4a 100644 +--- a/kstyle/breezestyle.h ++++ b/kstyle/breezestyle.h +@@ -320,6 +320,7 @@ namespace Breeze + bool drawToolButtonComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawComboBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawSpinBoxComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; ++ bool drawQ3ListViewComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawSliderComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawDialComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; + bool drawScrollBarComplexControl( const QStyleOptionComplex*, QPainter*, const QWidget* ) const; diff --git a/breeze4-style.changes b/breeze4-style.changes index 4cd58b1..851cea2 100644 --- a/breeze4-style.changes +++ b/breeze4-style.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 2 11:17:40 UTC 2016 - wbauer@tmo.at + +- Add add-support-for-Q3ListView-to-the-KDE4-style.patch to fix + the display of the collapse/expand icon in Q3ListView that still + may be used by some KDE4 applications, knode e.g. (boo#973728) + ------------------------------------------------------------------- Thu Sep 29 16:36:28 UTC 2016 - fabian@ritter-vogt.de diff --git a/breeze4-style.spec b/breeze4-style.spec index e15e2f8..e78a117 100644 --- a/breeze4-style.spec +++ b/breeze4-style.spec @@ -31,6 +31,8 @@ Group: System/GUI/KDE Url: http://www.kde.org #Source: http://download.kde.org/stable/plasma/%{version}/breeze-%{version}.tar.xz Source: breeze-%{version}.tar.xz +# PATCH-FIX-OPENSUSE add-support-for-Q3ListView-to-the-KDE4-style.patch boo#973728 wbauer@tmo.at -- fixes collapse/expand icon in Q3ListView that still may be used by some KDE4 applications (knode e.g.) +Patch: add-support-for-Q3ListView-to-the-KDE4-style.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -39,6 +41,7 @@ This package contains kde4 backport of new default Plasma 5 style. %prep %setup -q -n breeze-%{version} +%patch -p1 %build %cmake_kde4 -d build -- -DBUILD_po=OFF -DUSE_KDE4=ON