diff --git a/plasma-workspace-5.3.2.tar.xz b/plasma-workspace-5.3.2.tar.xz deleted file mode 100644 index 9f31a24..0000000 --- a/plasma-workspace-5.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4165a547efc59dd42a15d24f21f722d88e4acfb6fb6d6a4db3c3d0ce54fa54c4 -size 6860364 diff --git a/plasma-workspace-5.3.95.tar.xz b/plasma-workspace-5.3.95.tar.xz new file mode 100644 index 0000000..c969fc8 --- /dev/null +++ b/plasma-workspace-5.3.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80227f1f5bbf45ad71c397fc670eef3f7ae8dc888942a11a4799b5c661b8bd7c +size 6889568 diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 04eda30..59d7005 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-workspace -Version: 5.3.2 +Version: 5.3.95 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0+ @@ -31,45 +31,41 @@ Source99: %{name}-rpmlintrc Patch0: 0001-Rename-qdbus-in-startkde.patch # PATCH-FIX_OPENSUSE create_kdehome.patch -- https://bugs.kde.org/show_bug.cgi?id=338422#c8 Patch1: create_kdehome.patch -# PATCH-FIX_OPENSUSE 0003-Remove-export-of-QT_PLUGIN_PATH.patch -- we install plugins to directory known to Qt5, so export just pollutes both Qt4 and Qt5 plugins -Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch # PATCHES 100-200 and above are from upstream 5.3 branch # PATCHES 201-300 and above are from upstream master/5.4 branch -Patch201: use-the-filepath-as-the-unique-id-of-the-match.patch -Patch202: Baloo-Result-header-is-no-longer-installed.patch BuildRequires: alsa-devel BuildRequires: baloo5-devel >= %{version} -BuildRequires: kactivities5-devel >= 5.8.0 -BuildRequires: kcmutils-devel >= 5.8.0 -BuildRequires: kcoreaddons-devel >= 5.8.0 -BuildRequires: kcrash-devel >= 5.8.0 -BuildRequires: kdbusaddons-devel >= 5.8.0 -BuildRequires: kdeclarative-devel >= 5.8.0 -BuildRequires: kdelibs4support-devel >= 5.8.0 -BuildRequires: kdesu-devel >= 5.8.0 -BuildRequires: kdewebkit-devel >= 5.8.0 -BuildRequires: kdoctools-devel >= 5.8.0 +BuildRequires: kactivities5-devel >= 5.12.0 +BuildRequires: kcmutils-devel >= 5.12.0 +BuildRequires: kcoreaddons-devel >= 5.12.0 +BuildRequires: kcrash-devel >= 5.12.0 +BuildRequires: kdbusaddons-devel >= 5.12.0 +BuildRequires: kdeclarative-devel >= 5.12.0 +BuildRequires: kdelibs4support-devel >= 5.12.0 +BuildRequires: kdesu-devel >= 5.12.0 +BuildRequires: kdewebkit-devel >= 5.12.0 +BuildRequires: kdoctools-devel >= 5.12.0 BuildRequires: kf5-filesystem -BuildRequires: kglobalaccel-devel >= 5.8.0 -BuildRequires: kidletime-devel >= 5.8.0 -BuildRequires: kjsembed-devel >= 5.8.0 -BuildRequires: knewstuff-devel >= 5.8.0 -BuildRequires: knotifyconfig-devel >= 5.8.0 -BuildRequires: kpackage-devel >= 5.8.0 -BuildRequires: krunner-devel >= 5.8.0 -BuildRequires: ktexteditor-devel >= 5.8.0 -BuildRequires: kwallet-framework-devel >= 5.8.0 +BuildRequires: kglobalaccel-devel >= 5.12.0 +BuildRequires: kidletime-devel >= 5.12.0 +BuildRequires: kjsembed-devel >= 5.12.0 +BuildRequires: knewstuff-devel >= 5.12.0 +BuildRequires: knotifyconfig-devel >= 5.12.0 +BuildRequires: kpackage-devel >= 5.12.0 +BuildRequires: krunner-devel >= 5.12.0 +BuildRequires: ktexteditor-devel >= 5.12.0 +BuildRequires: kwallet-framework-devel >= 5.12.0 BuildRequires: kwayland-devel >= %{version} BuildRequires: kwin5-devel >= %{version} -BuildRequires: kxmlrpcclient5-devel >= 5.8.0 -BuildRequires: libKF5NetworkManagerQt-devel >= 5.8.0 +BuildRequires: kxmlrpcclient5-devel >= 5.12.0 +BuildRequires: libKF5NetworkManagerQt-devel >= 5.12.0 BuildRequires: libkscreen2-devel >= %{version} BuildRequires: libksysguard5-devel >= %{version} BuildRequires: libxcb-devel BuildRequires: pam-devel BuildRequires: phonon4qt5-devel -BuildRequires: plasma-framework-devel >= 5.8.0 -BuildRequires: solid-devel >= 5.8.0 +BuildRequires: plasma-framework-devel >= 5.12.0 +BuildRequires: solid-devel >= 5.12.0 BuildRequires: update-desktop-files BuildRequires: wayland-devel >= 1.3.0 BuildRequires: xz @@ -94,7 +90,7 @@ BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) Conflicts: kdebase4-workspace < 5.3.0 -Requires: %{name}-branding = %{version} +Requires: %{name}-branding = %{_plasma5_branding_version} Requires: %{name}-libs = %{version}-%{release} # used within startup Requires: kde-cli-tools5 >= %{version} @@ -139,7 +135,7 @@ This package contains the basic packages for a Plasma workspace. %package branding-upstream Summary: The KDE Plasma Workspace Components Group: System/GUI/KDE -Provides: %{name}-branding = %{version} +Provides: %{name}-branding = %{_plasma5_branding_version} Supplements: packageand(plasma5-workspace:branding-upstream) Conflicts: otherproviders(%{name}-branding) @@ -191,9 +187,6 @@ workspace. Development files. %setup -q -n plasma-workspace-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch201 -p1 -%patch202 -p1 %build %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5 @@ -238,6 +231,7 @@ workspace. Development files. %{_kf5_bindir}/plasmashell %{_kf5_bindir}/plasmawindowed %{_kf5_bindir}/startkde +%{_kf5_bindir}/startplasmacompositor %{_kf5_bindir}/systemmonitor %{_kf5_configdir}/autostart/org.kde.klipper.desktop %{_kf5_configdir}/autostart/plasmashell.desktop @@ -249,6 +243,7 @@ workspace. Development files. %{_kf5_libdir}/libexec/kcheckpass %{_kf5_libdir}/libexec/kscreenlocker_greet %{_kf5_libdir}/libexec/ksyncdbusenv +%{_kf5_libdir}/libexec/startplasma %{_kf5_libdir}/libkdeinit5_kcminit.so %{_kf5_libdir}/libkdeinit5_kcminit_startup.so %{_kf5_libdir}/libkdeinit5_klipper.so @@ -265,6 +260,7 @@ workspace. Development files. %dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} %doc %{_kf5_htmldir}/en/klipper/ +%doc %{_kf5_htmldir}/en/kcontrol/ %{_kf5_notifydir}/ %{_kf5_servicesdir}/ %{_kf5_servicetypesdir}/ @@ -275,6 +271,7 @@ workspace. Development files. %{_kf5_plasmadir}/ %{_kf5_sharedir}/solid/ %{_kf5_sharedir}/sddm/ +%{_kf5_sharedir}/kio_desktop/ %files -n drkonqi5 %defattr(-,root,root) @@ -310,7 +307,7 @@ workspace. Development files. %files lang %defattr(-,root,root) %{_kf5_localedir}/ -%doc %lang(ca) %{_kf5_htmldir}/ca/ +%doc %lang(de) %{_kf5_htmldir}/de/ %endif %changelog