Hello community, here is the log from the commit of package oxygen5 for openSUSE:Factory checked in at 2016-11-10 13:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/oxygen5 (Old) and /work/SRC/openSUSE:Factory/.oxygen5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "oxygen5" Changes: -------- --- /work/SRC/openSUSE:Factory/oxygen5/oxygen5.changes 2016-11-04 20:56:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.oxygen5.new/oxygen5.changes 2016-11-10 13:58:35.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Nov 6 14:23:31 UTC 2016 - [email protected] + +- Added Fix-broken-kcfgc-files.patch from upstream + +------------------------------------------------------------------- +Thu Nov 3 17:41:25 UTC 2016 - [email protected] + +- Introduce new _plasma5_bugfix global for more fine-tuned dependencies + +------------------------------------------------------------------- New: ---- Fix-broken-kcfgc-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen5.spec ++++++ --- /var/tmp/diff_new_pack.WGwA8E/_old 2016-11-10 13:58:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WGwA8E/_new 2016-11-10 13:58:36.000000000 +0100 @@ -22,13 +22,18 @@ Name: oxygen5 Version: 5.8.3 Release: 0 -%{!?_plasma5_version: %global _plasma5_version %{version}} +# Full Plasma 5 version (e.g. 5.8.3) +%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}} +# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.90 in KUF) +%{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')} Summary: Oxygen style, KWin decoration, cursors and sounds License: GPL-2.0+ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/plasma/%{version}/oxygen-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM Fix-broken-kcfgc-files.patch +Patch0: Fix-broken-kcfgc-files.patch BuildRequires: extra-cmake-modules >= 0.0.9 BuildRequires: kf5-filesystem BuildRequires: cmake(KF5Completion) @@ -136,6 +141,7 @@ %lang_package %prep %setup -q -n oxygen-%{version} +%patch0 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ Fix-broken-kcfgc-files.patch ++++++ From: Aleix Pol <[email protected]> Date: Fri, 28 Oct 2016 12:16:17 +0000 Subject: Fix broken kcfgc files X-Git-Url: http://quickgit.kde.org/?p=oxygen.git&a=commitdiff&h=eb6ba888913283f74de5e2172e872bc9d3f983a7 --- Fix broken kcfgc files They need to refer to the kcfg file, not to themselves... --- --- a/kdecoration/oxygensettings.kcfgc +++ b/kdecoration/oxygensettings.kcfgc @@ -1,4 +1,4 @@ -File=oxygensettingsdata.kcfgc +File=oxygensettingsdata.kcfg ClassName=InternalSettings NameSpace=Oxygen Singleton=false --- a/kstyle/oxygenstyleconfigdata.kcfgc +++ b/kstyle/oxygenstyleconfigdata.kcfgc @@ -1,4 +1,4 @@ -File=oxygen.kcfgc +File=oxygen.kcfg ClassName=StyleConfigData NameSpace=Oxygen Singleton=true --- a/liboxygen/oxygenactiveshadowconfiguration.kcfgc +++ b/liboxygen/oxygenactiveshadowconfiguration.kcfgc @@ -1,4 +1,4 @@ -File=oxygenactiveshadowconfigdata.kcfgc +File=oxygenactiveshadowconfigdata.kcfg ClassName=ActiveShadowConfiguration NameSpace=Oxygen Singleton=true --- a/liboxygen/oxygeninactiveshadowconfiguration.kcfgc +++ b/liboxygen/oxygeninactiveshadowconfiguration.kcfgc @@ -1,4 +1,4 @@ -File=oxygeninactiveshadowconfigdata.kcfgc +File=oxygeninactiveshadowconfigdata.kcfg ClassName=InactiveShadowConfiguration NameSpace=Oxygen Singleton=true
