diff --git a/.gitignore b/.gitignore index d07e000..eb1de59 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /plasma-desktop-5.3.2.tar.xz /plasma-desktop-5.4.0.tar.xz /plasma-desktop-5.4.1.tar.xz +/plasma-desktop-5.4.2.tar.xz diff --git a/plasma-desktop-5.4.1-kauth_helper.patch b/plasma-desktop-5.4.1-kauth_helper.patch deleted file mode 100644 index bdf8a30..0000000 --- a/plasma-desktop-5.4.1-kauth_helper.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake ---- plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake.kauth_helper 2015-09-03 05:48:44.000000000 -0500 -+++ plasma-desktop-5.4.1/kcms/kfontinst/config-fontinst.h.cmake 2015-09-28 18:38:00.560763031 -0500 -@@ -1,7 +1,7 @@ - #ifndef __CONFIG_FONTINST_H__ - #define __CONFIG_FONTINST_H__ - --#define KFONTINST_LIB_EXEC_DIR "${CMAKE_INSTALL_PREFIX}/${KAUTH_HELPER_INSTALL_DIR}" -+#define KFONTINST_LIB_EXEC_DIR "${KAUTH_HELPER_INSTALL_ABSOLUTE_DIR}" - - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_LOCALE_H 1 -diff -up plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake ---- plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake.kauth_helper 2015-09-03 05:48:44.000000000 -0500 -+++ plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.service.cmake 2015-09-28 18:39:12.058195439 -0500 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=org.kde.fontinst --Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst -+Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst - -diff -up plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake.kauth_helper plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake ---- plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake.kauth_helper 2015-09-03 05:48:44.000000000 -0500 -+++ plasma-desktop-5.4.1/kcms/kfontinst/dbus/org.kde.fontinst.system-service.cmake 2015-09-28 18:41:09.250906989 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=org.kde.fontinst --Exec=@CMAKE_INSTALL_PREFIX@/@KAUTH_HELPER_INSTALL_DIR@/fontinst -+Exec=@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@/fontinst - User=root - diff --git a/plasma-desktop.spec b/plasma-desktop.spec index c899449..e4ef98d 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,13 +1,13 @@ %global kf5_version 5.13.0 -Name: plasma-desktop -Version: 5.4.1 -Release: 7%{?dist} -Summary: Plasma Desktop shell +Name: plasma-desktop +Summary: Plasma Desktop shell +Version: 5.4.2 +Release: 1%{?dist} -License: GPLv2+ and (GPLv2 or GPLv3) -URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop +License: GPLv2+ and (GPLv2 or GPLv3) +URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -15,7 +15,7 @@ URL: https://projects.kde.org/projects/kde/workspace/plasma-desktop %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz %global majmin_ver %(echo %{version} | cut -d. -f1,2) @@ -31,10 +31,6 @@ Patch102: plasma-desktop-fedora_layout.patch Patch103: plasma-desktop-C_locale.patch ## upstream patches -# consistently use KAUTH_HELPER_INSTALL_ABSOLUTE_DIR instead of CMAKE_INSTALL_PREFIX/KAUTH_HELPER_INSTALL_DIR -# FIXME: seems upstream expects KAUTH_HELPER_INSTALL_DIR to be relative, figure out why our default build flags -# set that to be absolute instead. -Patch50: plasma-desktop-5.4.1-kauth_helper.patch ## upstreamable patches @@ -161,8 +157,6 @@ BuildArch: noarch %prep %setup -q -%patch50 -p1 -b .kauth_helper - %if 0%{?fedora} > 22 %patch100 -p1 -b .default_favorites %else @@ -223,6 +217,7 @@ if [ $1 -eq 0 ] ; then fi %files -f plasmadesktop5.lang +%license COPYING* %if 0%{?fedora} > 20 %{_bindir}/kapplymousetheme %endif @@ -308,6 +303,9 @@ fi %changelog +* Fri Oct 02 2015 Rex Dieter - 5.4.2-1 +- 5.4.2, use %%license, .spec cosmetics + * Thu Oct 01 2015 Rex Dieter 5.4.1-7 - relax some deps %%{version} => %%{majmin_ver} to ease bootstrapping diff --git a/sources b/sources index d08add8..553ed31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -823180ad53fafca7a6be56ab3f9ec2df plasma-desktop-5.4.1.tar.xz +457b1b6d69fd52416485e08ed7744fe3 plasma-desktop-5.4.2.tar.xz