[plasma-oxygen/f21: 2/3] Downgrade to 5.0.2 and ship only the Qt 5 style for F20/F21.
Kevin Kofler
kkofler at fedoraproject.org
Wed Nov 19 22:46:31 UTC 2014
commit d200d67195fd8285a7d8dd2b79b362132114b96f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Nov 19 23:27:27 2014 +0100
Downgrade to 5.0.2 and ship only the Qt 5 style for F20/F21.
Oxygen 5.0.x matches the look&feel of the KDE 4 theme. Oxygen 5.1.0 got
major changes which make the look&feel closer to Breeze, and can be
built against KDE 4 to obtain the same look&feel there. We want to keep
the original KDE 4 Oxygen look&feel on Fedora <= 21.
.gitignore | 1 +
plasma-oxygen.spec | 200 +++++++++++-----------------------------------------
sources | 2 +-
3 files changed, 43 insertions(+), 160 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0235d3b..20b64ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/oxygen-5.1.1.tar.xz
+/oxygen-5.0.2.tar.xz
diff --git a/plasma-oxygen.spec b/plasma-oxygen.spec
index a216e9c..3164437 100644
--- a/plasma-oxygen.spec
+++ b/plasma-oxygen.spec
@@ -1,35 +1,29 @@
-%global base_name oxygen
+# Please DO NOT UPGRADE this package to 5.1.0 or later!
+#
+# Oxygen 5.0.x matches the look&feel of the KDE 4 theme. Oxygen 5.1.0 got major
+# changes which make the look&feel closer to Breeze, and can be built against
+# KDE 4 to obtain the same look&feel there. We want to keep the original KDE 4
+# Oxygen look&feel on Fedora <= 21.
+
+%define base_name oxygen
Name: plasma-%{base_name}
-Version: 5.1.1
-Release: 8%{?dist}
-Summary: Plasma and Qt widget style and window decorations for Plasma 5 and KDE 4
+# // !!! DO NOT UPGRADE! See comment at the top! !!! \\
+Version: 5.0.2
+# \\ !!! DO NOT UPGRADE! See comment at the top! !!! //
+Release: 2%{?dist}
+Summary: Oxygen widget style for Qt 5 and KDE Frameworks 5 applications
License: GPLv2+
-URL: https://projects.kde.org/projects/kde/workspace/oxygen
-
-%global revision %(echo %{version} | cut -d. -f3)
-%if %{revision} >= 50
-%global stable unstable
-%else
-%global stable stable
-%endif
-Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz
-
-# Qt 4 dependencies
-BuildRequires: kdelibs-devel
-BuildRequires: libxcb-devel
-# Don't build the KWin style, we don't need that
-#BuildRequires: kde-workspace-devel
-
-# Qt 5
+URL: http://www.kde.org
+Source0: http://download.kde.org/stable/plasma/%{version}/%{base_name}-%{version}.tar.xz
+
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtx11extras-devel
BuildRequires: kf5-rpm-macros
BuildRequires: extra-cmake-modules
-# KF5
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: kf5-kguiaddons-devel
@@ -39,163 +33,51 @@ BuildRequires: kf5-kcompletion-devel
BuildRequires: kf5-frameworkintegration-devel
BuildRequires: kf5-kwindowsystem-devel
-# KWin (for window decoration - KWin 5 only)
-BuildRequires: kwin-devel >= 5.1.0
-
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}
-
%description
-%{summary}.
-
-%package -n qt4-style-oxygen
-Summary: Oxygen widget style for Qt 4
-Provides: kde-style-oxygen%{?_isa} = %{version}-%{release}
-# When this was created
-Obsoletes: kde-style-oxygen < 5.1.1-2
-Obsoletes: plasma-oxygen-kde4 < 5.1.1-2
-%description -n qt4-style-oxygen
-%{summary}.
-
-%package -n qt5-style-oxygen
-Summary: Oxygen widget style for Qt 5
-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
-Obsoletes: plasma-oxygen-common < 5.1.1-2
-%description -n oxygen-cursor-themes
-%{summary}.
-
-%package -n oxygen-sound-theme
-Summary: Sounds for Oxygen theme
-BuildArch: noarch
-Obsoletes: plasma-oxygen-common < 5.1.1-2
-%description -n oxygen-sound-theme
-%{summary}.
+A port of the KDE 4 Oxygen widget style to Qt 5 / KDE Frameworks 5, so Qt 5
+and KDE Frameworks 5 applications integrate seamlessly into KDE 4.
%prep
%setup -q -n %{base_name}-%{version}
+# disable cursors and sounds
+sed -i -e 's/^add_subdirectory(cursors)$/#add_subdirectory(cursors)/g' \
+ -e 's/^add_subdirectory(sounds)$/#add_subdirectory(sounds)/g' CMakeLists.txt
%build
-%define qt5_target_platform %{_target_platform}-qt5
-%define qt4_target_platform %{_target_platform}-qt4
-
-# Build for Qt 4
-mkdir -p %{qt4_target_platform}
-pushd %{qt4_target_platform}
-%{cmake_kde4} .. -DOXYGEN_USE_KDE4:BOOL=ON
-popd
-
-make %{?_smp_mflags} -C %{qt4_target_platform}
-
-# Build for Qt 5
-mkdir -p %{qt5_target_platform}
-pushd %{qt5_target_platform}
-%{cmake_kf5} ..
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kf5} -DCMAKE_DISABLE_FIND_PACKAGE_KDecorations:BOOL=TRUE ..
popd
-make %{?_smp_mflags} -C %{qt5_target_platform}
-
+make %{?_smp_mflags} -C %{_target_platform}
%install
-make install/fast DESTDIR=%{buildroot} -C %{qt4_target_platform}
-make install/fast DESTDIR=%{buildroot} -C %{qt5_target_platform}
-
-%find_lang oxygen --with-qt --all-name
-
-# Don't both with -devel subpackages, there are no headers anyway
-rm %{buildroot}/%{_libdir}/liboxygenstyle5.so
-rm %{buildroot}/%{_libdir}/liboxygenstyleconfig5.so
-rm %{buildroot}/%{_kde4_libdir}/liboxygenstyle.so
-rm %{buildroot}/%{_kde4_libdir}/liboxygenstyleconfig.so
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+# don't ship -devel files
+rm -f %{buildroot}%{_libdir}/*.so
+%find_lang oxygen5 --with-qt --all-name
-%post -n qt4-style-oxygen -p /sbin/ldconfig
-%postun -n qt4-style-oxygen -p /sbin/ldconfig
+%post -p /sbin/ldconfig
-%files
-# Empty
+%postun -p /sbin/ldconfig
-%files -n qt4-style-oxygen
-%{_kde4_libdir}/liboxygenstyle.so.*
-%{_kde4_libdir}/liboxygenstyleconfig.so.*
-%{_kde4_libdir}/kde4/kstyle_oxygen_config.so
-%{_kde4_libdir}/kde4/plugins/styles/oxygen.so
-%{_kde4_appsdir}/kstyle/themes/oxygen.themerc
-%{_kde4_bindir}/oxygen-demo
-
-%post -n qt5-style-oxygen -p /sbin/ldconfig
-%postun -n qt5-style-oxygen -p /sbin/ldconfig
-
-%files -n qt5-style-oxygen -f oxygen.lang
+%files -f oxygen5.lang
+%doc COPYING
%{_bindir}/oxygen-demo5
%{_bindir}/oxygen-settings5
-%{_libdir}/liboxygenstyle5.so.*
-%{_libdir}/liboxygenstyleconfig5.so.*
-%{_kf5_qtplugindir}/styles/oxygen.so
-%{_kf5_datadir}/kstyle/themes/oxygen.themerc
-%{_kf5_datadir}/plasma/look-and-feel/org.kde.oxygen/
-
-%files -n kwin-oxygen
+%{_libdir}/*.so.*
%{_kf5_qtplugindir}/kstyle_oxygen_config.so
-%{_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 || :
-
-%postun -n oxygen-cursor-themes
-if [ $1 -eq 0 ] ; then
- /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-fi
-
-%posttrans -n oxygen-cursor-themes
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-
-%files -n oxygen-cursor-themes
-%{_datadir}/icons/*
-
-%files -n oxygen-sound-theme
-%{_datadir}/sounds/*
-
+%{_kf5_qtplugindir}/styles/oxygen.so
+%{_datadir}/kstyle/themes/oxygen.themerc
%changelog
-* Wed Nov 19 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.1-8
-- Remove Conflicts kde-style-oxygen from kwin-oxygen
-- Remove Requires themes from qt{4,5}-style-oxygen
-- Fixed scriptlets
-
-* Thu Nov 13 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.1-7
-- Fix Obsoletes issue when updating
-
-* Wed Nov 12 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.1-2
-- change subpackages, merge with plasma-oxygen-kde4
-
-* Fri Nov 07 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.1-1
-- Plasma 5.1.1
-
-* Tue Oct 14 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.0.1-1
-- Plasma 5.1.0.1
-
-* Thu Oct 09 2014 Daniel Vrátil <dvratil at redhat.com> - 5.1.0-1
-- Plasma 5.1.0
+* Sat Oct 25 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 5.0.2-2
+- Change summary and description
+- Disable the KWin style, the cursors and the sounds
+- Disable unneeded -devel subpackage
+- Use make install/fast
* Tue Sep 16 2014 Daniel Vrátil <dvratil at redhat.com> - 5.0.2-1
- Plasma 5.0.2
diff --git a/sources b/sources
index 210c3a2..80f1cd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc112c113dedcbac338e0db89af4b388 oxygen-5.1.1.tar.xz
+b9e4e84e68e7b69babd899725ea8bb94 oxygen-5.0.2.tar.xz
More information about the scm-commits
mailing list