Sync with KDE:Frameworks5:LTS

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/oxygen5?expand=0&rev=117

oxygen5.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Sep 21 17:31:18 UTC 2016 - fabian@ritter-vogt.de
+
+- Fix self-obsoletion
+
+-------------------------------------------------------------------
+Wed Sep 21 09:15:11 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
 

oxygen5.spec

@@ -22,11 +22,11 @@
 Name:           oxygen5
 Version:        5.7.95
 Release:        0
+%{!?_plasma5_version: %global _plasma5_version %{version}}
 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/unstable/plasma/%{version}/http://download.kde.org/stable/plasma/%{version}/oxygen-%{version}.tar.xz
 Source:         http://download.kde.org/unstable/plasma/%{version}/oxygen-%{version}.tar.xz
 Source1:        baselibs.conf
 BuildRequires:  extra-cmake-modules >= 0.0.9
@@ -40,11 +40,11 @@ BuildRequires:  cmake(KF5GuiAddons)
 BuildRequires:  cmake(KF5I18n)
 BuildRequires:  cmake(KF5KCMUtils)
 BuildRequires:  cmake(KF5Service)
-BuildRequires:  cmake(KF5Wayland) >= %{version}
+BuildRequires:  cmake(KF5Wayland) >= %{_plasma5_version}
 BuildRequires:  cmake(KF5WidgetsAddons)
 BuildRequires:  cmake(KF5WindowSystem)
 %if %kwin_deco
-BuildRequires:  cmake(KDecoration2) >= %{version}
+BuildRequires:  cmake(KDecoration2) >= %{_plasma5_version}
 %endif
 BuildRequires:  xz
 BuildRequires:  cmake(Qt5DBus) >= 5.4.0
@@ -81,8 +81,8 @@ Development files.
 Summary:        The KDE Workspace Sounds
 License:        GPL-2.0+
 Group:          System/GUI/KDE
-Obsoletes:      oxygen-sounds5
-Provides:       oxygen-sounds5
+Obsoletes:      oxygen-sounds5 < %{version}
+Provides:       oxygen-sounds5 = %{version}
 
 %description sounds
 This package contains the default sound set for a K Desktop Environment
@@ -102,8 +102,8 @@ Provides:       oxygen-cursors4 = %{version}
 Conflicts:      oxygen4-cursors
 Conflicts:      oxygen-cursors4
 %endif
-Obsoletes:      oxygen-cursors5
-Provides:       oxygen-cursors5
+Obsoletes:      oxygen-cursors5 < %{version}
+Provides:       oxygen-cursors5 = %{version}
 
 %description cursors
 This package contains the default cursor set for a K Desktop Environment
@@ -113,8 +113,8 @@ workspace.
 Summary:        Oxygen style
 License:        GPL-2.0+
 Group:          System/GUI/KDE
-Obsoletes:      oxygen-style5
-Provides:       oxygen-style5
+Obsoletes:      oxygen-style5 < %{version}
+Provides:       oxygen-style5 = %{version}
 
 %description style
 This package contains the libraries of the Oxygen style.
@@ -125,8 +125,8 @@ Summary:        Oxygen's KWin decoration
 License:        GPL-2.0+
 Group:          System/GUI/KDE
 Supplements:    packageand(oxygen5-style:kwin5)
-Obsoletes:      oxygen-decoration5
-Provides:       oxygen-decoration5
+Obsoletes:      oxygen-decoration5 < %{version}
+Provides:       oxygen-decoration5 = %{version}
 %requires_eq oxygen5-style
 
 %description decoration