[plasma-oxygen] Update to Plasma 5.1.95 (Plasma 5.2 beta)

Daniel Vrátil dvratil at fedoraproject.org
Fri Jan 16 11:16:19 UTC 2015


commit 86050b4abec3c5f6b823e00f90ea7ba5779eb650
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Jan 16 12:16:38 2015 +0100

    Update to Plasma 5.1.95 (Plasma 5.2 beta)

 .gitignore         |    1 +
 plasma-oxygen.spec |   30 ++++++++++++++----------------
 sources            |    2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0235d3b..ccc4af2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /oxygen-5.1.1.tar.xz
+/oxygen-5.1.95.tar.xz
diff --git a/plasma-oxygen.spec b/plasma-oxygen.spec
index 5245af5..ff0eb2d 100644
--- a/plasma-oxygen.spec
+++ b/plasma-oxygen.spec
@@ -1,8 +1,8 @@
 %global         base_name oxygen
 
 Name:           plasma-%{base_name}
-Version:        5.1.1
-Release:        9%{?dist}
+Version:        5.1.95
+Release:        1.beta%{?dist}
 Summary:        Plasma and Qt widget style and window decorations for Plasma 5 and KDE 4
 
 License:        GPLv2+
@@ -40,16 +40,18 @@ BuildRequires:  kf5-frameworkintegration-devel
 BuildRequires:  kf5-kwindowsystem-devel
 
 # KWin (for window decoration - KWin 5 only)
-BuildRequires:  kwin-devel >= 5.1.0
+BuildRequires:  kwin-devel = %{version}-%{release}
 
 Requires:       kf5-filesystem
 
 Requires:       qt4-style-oxygen = %{version}-%{release}
 Requires:       qt5-style-oxygen = %{version}-%{release}
-Requires:       kwin-oxygen = %{version}-%{release}
 Requires:       oxygen-cursor-themes = %{version}-%{release}
 Requires:       oxygen-sound-theme = %{version}-%{release}
 
+# kwin-oxygen was removed in 5.1.95
+Obsoletes:	kwin-oxygen < 5.1.95-1
+
 %description
 %{summary}.
 
@@ -68,14 +70,6 @@ Obsoletes:      plasma-oxygen < 5.1.1-2
 %description -n qt5-style-oxygen
 %{summary}.
 
-%package -n     kwin-oxygen
-Summary:        Oxygen window decoration plugin for KWin 5
-Obsoletes:      plasma-oxygen < 5.1.1-2
-# Requires KWin 5
-Requires:       kwin%{?_isa} >= 5.0.0
-%description -n kwin-oxygen
-%{summary}.
-
 %package -n     oxygen-cursor-themes
 Summary:        Oxygen cursor themes
 BuildArch:      noarch
@@ -139,6 +133,7 @@ rm %{buildroot}/%{_kde4_libdir}/liboxygenstyleconfig.so
 %{_kde4_libdir}/kde4/plugins/styles/oxygen.so
 %{_kde4_appsdir}/kstyle/themes/oxygen.themerc
 %{_kde4_bindir}/oxygen-demo
+%{_kde4_bindir}/oxygen-settings
 
 %post -n    qt5-style-oxygen -p /sbin/ldconfig
 %postun -n  qt5-style-oxygen -p /sbin/ldconfig
@@ -153,10 +148,6 @@ rm %{buildroot}/%{_kde4_libdir}/liboxygenstyleconfig.so
 %{_kf5_datadir}/kstyle/themes/oxygen.themerc
 %{_kf5_datadir}/plasma/look-and-feel/org.kde.oxygen/
 
-%files -n   kwin-oxygen
-%{_kf5_qtplugindir}/kwin/kdecorations/config/kwin_oxygen_config.so
-%{_kf5_qtplugindir}/kwin/kdecorations/kwin3_oxygen.so
-
 %post -n    oxygen-cursor-themes
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
@@ -177,6 +168,13 @@ fi
 
 
 %changelog
+* Mon Jan 12 2015 Daniel Vrátil <dvratil at redhat.com> - 5.1.95-1
+- Plasma 5.1.95 Beta
+- removed kwin-oxygen subpackage, as Oxygen does not provide KDecoration1-based windecos as of 5.1.95
+
+* Wed Dec 17 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.2-2
+- Plasma 5.1.2
+
 * Wed Nov 19 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.1.1-9
 - Move kstyle_oxygen_config.so from kwin-oxygen to qt5-style-oxygen
 
diff --git a/sources b/sources
index 210c3a2..17e7a4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc112c113dedcbac338e0db89af4b388  oxygen-5.1.1.tar.xz
+0cae271ae261054fa5283890e4257baf  oxygen-5.1.95.tar.xz


More information about the scm-commits mailing list