diff --git a/.gitignore b/.gitignore index 31d2be5..f135a08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1 @@ -/plasma-desktop-5.7.5.tar.xz -/plasma-desktop-5.7.95.tar.xz -/plasma-desktop-5.8.0.tar.xz -/plasma-desktop-5.8.1.tar.xz -/plasma-desktop-5.8.2.tar.xz -/plasma-desktop-5.8.3.tar.xz -/plasma-desktop-5.8.4.tar.xz -/plasma-desktop-5.8.5.tar.xz -/plasma-desktop-5.8.6.tar.xz -/plasma-desktop-5.9.3.tar.xz -/plasma-desktop-5.9.4.tar.xz -/0001-Add-missing-member-initialization.patch -/0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch -/0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch -/0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch -/0005-Applet-Alternatives-Fix-icon-size.patch -/0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch +/plasma-desktop-5.9.5.tar.xz diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 4fd02ad..f4b2ad5 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,10 +1,14 @@ %global kf5_version_min 5.26.0 +%if 0%{?fedora} < 26 +# support kde4-based konqueror (or not) +%global konq4 1 +%endif Name: plasma-desktop Summary: Plasma Desktop shell -Version: 5.9.4 -Release: 2%{?dist} +Version: 5.9.5 +Release: 1%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://cgit.kde.org/%{name}.git @@ -24,12 +28,6 @@ Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}. Patch100: plasma-desktop-5.8-default_favorites.patch ## upstream patches -Patch1: 0001-Add-missing-member-initialization.patch -Patch2: 0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch -Patch3: 0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch -Patch4: 0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch -Patch5: 0005-Applet-Alternatives-Fix-icon-size.patch -Patch6: 0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch ## upstreamable patches @@ -81,10 +79,11 @@ BuildRequires: kf5-kinit-devel >= %{kf5_version_min} %{?kf5_kinit_requires} BuildRequires: kf5-ksysguard-devel >= %{majmin_ver} - BuildRequires: kscreenlocker-devel >= %{majmin_ver} -BuildRequires: plasma-workspace-devel >= %{majmin_ver} BuildRequires: kwin-devel >= %{majmin_ver} +# see %%prep below -- rex +BuildRequires: plasma-breeze >= %{majmin_ver}} +BuildRequires: plasma-workspace-devel >= %{majmin_ver} # Optional BuildRequires: kf5-kactivities-devel >= %{kf5_version_min} @@ -177,15 +176,15 @@ BuildArch: noarch %patch100 -p1 ## upstream patches -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 ## upstreamable patches +# FIXME: relax plasma-breeze dep +sed -i.breeze_ver \ + -e "s|find_package(Breeze \${PROJECT_VERSION} |find_package(Breeze %{majmin_ver} |" \ + CMakeLists.txt + + %build %ifarch s390 %{arm} # Decrease debuginfo verbosity to reduce memory consumption even more @@ -202,15 +201,20 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang plasmadesktop5 --with-qt --all-name +%find_lang %{name} --with-html --with-qt --all-name + +grep "%{_kf5_docdir}" %{name}.lang > %{name}-doc.lang +cat %{name}.lang %{name}-doc.lang | sort | uniq -u > plasmadesktop5.lang # No -devel rm -fv %{buildroot}%{_libdir}/libkfontinst{,ui}.so +%if 0%{?konq4} # Copy konqsidebartng to kde4/apps so that KDE Konqueror can find it mkdir -p %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/ cp %{buildroot}%{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop \ %{buildroot}%{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services +%endif # rename script to force it to run again (initial 5.5.0 version was buggy) mv %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/updates/obsolete_kickoffrc.js \ @@ -261,7 +265,6 @@ fi # TODO: -libs subpkg -- rex %{_kf5_libdir}/libkfontinst.so.* %{_kf5_libdir}/libkfontinstui.so.* -#{_kf5_libdir}/libKF5ActivitiesExperimentalStats.so.* %{_kf5_qtplugindir}/*.so %{_kf5_qtplugindir}/kcms/*.so %{_kf5_plugindir}/kded/*.so @@ -290,10 +293,11 @@ fi %{_kf5_datadir}/kcm_phonon %{_kf5_datadir}/kfontinst %{_kf5_datadir}/kcmkeyboard -#{_kf5_datadir}/ksmserver %{_kf5_datadir}/kpackage/kcms/* %{_datadir}/konqsidebartng/virtual_folders/services/fonts.desktop +%if %{?konq4} %{_datadir}/kde4/apps/konqsidebartng/virtual_folders/services/fonts.desktop +%endif %{_kf5_datadir}/kf5/kactivitymanagerd/workspace/ %{_kf5_datadir}/kcmsolidactions/ %{_kf5_datadir}/solid/devices/*.desktop @@ -317,28 +321,13 @@ fi %files kimpanel-scim %{_libexecdir}/kimpanel-scim-panel -%files doc -#lang(ca) %{_docdir}/HTML/ca/kcontrol/ -#lang(ca) %{_docdir}/HTML/ca/kfontview/ -#lang(ca) %{_docdir}/HTML/ca/knetattach/ -#lang(ca) %{_docdir}/HTML/ca/plasma-desktop/ -#lang(cs) %{_docdir}/HTML/cs/kcontrol/ -%lang(de) %{_docdir}/HTML/de/kfontview/ -%lang(de) %{_docdir}/HTML/de/knetattach/ -%lang(de) %{_docdir}/HTML/de/plasma-desktop/ -%lang(en) %{_docdir}/HTML/en/kcontrol/ -%lang(en) %{_docdir}/HTML/en/kfontview/ -%lang(en) %{_docdir}/HTML/en/knetattach/ -%lang(en) %{_docdir}/HTML/en/plasma-desktop/ -%lang(it) %{_docdir}/HTML/it/plasma-desktop -%lang(nl) %{_docdir}/HTML/nl/plasma-desktop/ -%lang(pt_BR) %{_docdir}/HTML/pt_BR/plasma-desktop/ -%lang(ru) %{_docdir}/HTML/ru/plasma-desktop/ -%lang(sv) %{_docdir}/HTML/sv/plasma-desktop/ -%lang(uk) %{_docdir}/HTML/uk/plasma-desktop/ +%files doc -f %{name}-doc.lang %changelog +* Wed Apr 26 2017 Rex Dieter - 5.9.5-1 +- 5.9.5, cleanup, BR: plasma-breeze, use %%find_lang more + * Fri Apr 14 2017 Rex Dieter - 5.9.4-2 - pull in upstream fixes, update URL diff --git a/sources b/sources index cd3f744..32614d8 100644 --- a/sources +++ b/sources @@ -1,7 +1 @@ -SHA512 (plasma-desktop-5.9.4.tar.xz) = 07a5966d45d4d8ea791161958f04d8f69ae5c0545ec0df9175498d669966df6bd7597532411b5574ddd159757b34f0870d1c263704958459e7d60d69e0b8d7f1 -SHA512 (0001-Add-missing-member-initialization.patch) = 5d5575142552fe885672cd071dafd928fc4fb64561633ff59df2dac900641c1e627ed0edbc22f9898672f1360ac0047443a41d4a376c588afe63af41d0fd01a5 -SHA512 (0002-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch) = 944fd8a69dcee0c5334240f759cac0ac5e2a7b368a43ba47e6b661299d52aa9e26ed0a2b317b0debbe78f6a2be007ae5d651d677437e9eea909eb41c61f3172b -SHA512 (0003-Set-wrapMode-to-NoWrap-when-maximumLineCount-is-1.patch) = 10c3b4b1205dfc2d039e06831a3a722a3b637142f4a97f6e2c5902da4f82543fe18248901e2fc61ca642e3e1ab6409a93ee4d17d30418a3b9f7989425a169690 -SHA512 (0004-Task-Manager-Don-t-delay-appearance-of-audio-stream-.patch) = 4e75b6218c354675dc0d7489cf049e789f74431855d859084207850e16c55582e3161474707848b1682c346b9c60827757dd0d6d1e3e1b014150d055d0bd272b -SHA512 (0005-Applet-Alternatives-Fix-icon-size.patch) = 8dffb1b7b50cd16024bf25b8614cbbb32a52a36f56568c6d7ce9dd87d88a5a04f3e77d83a4b79feee32f012ff819c22b0b3178f94e175edfb44740745ba9e72c -SHA512 (0006-Applet-Alternatives-Don-t-animate-highlight-resize.patch) = 3d925e6e6a9f75e323af74a769d2bec47f2de46029b7a6764f90dff65f4cf7a6865c78cfc7f349c82dbc9a7fd59f9c43db0f89d5eb695e962848ff2a1c0a83b5 +SHA512 (plasma-desktop-5.9.5.tar.xz) = 7fd97eb5379ee1a4fe1fec89a299110381fbffbc01880e36dcea67221a378e8d836e5dbe6cf6467a27745d37f2d5ca977cf180fe29e09a14edce047a5d4eb6f6