From 57fac68fb7a4da845a70574e8781ad74ddfcae2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Mon, 26 Jan 2015 17:44:26 +0100 Subject: [PATCH] Plasma 5.2.0 --- .gitignore | 1 + polkit-kde.spec | 66 ++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 42 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 236537f..be97f4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /polkit-kde-agent-1-0.99.0.tar.bz2 /polkit-kde-agent-1-0.99.1-20130311git.tar.bz2 +/polkit-kde-agent-1-5.2.0.tar.xz diff --git a/polkit-kde.spec b/polkit-kde.spec index f96342c..590d52b 100644 --- a/polkit-kde.spec +++ b/polkit-kde.spec @@ -1,27 +1,37 @@ - -%define snap 20130311git +%global base_name polkit-kde-agent-1 Name: polkit-kde Summary: PolicyKit integration for KDE Desktop -Version: 0.99.1 -Release: 6.%{snap}%{?dist} +Version: 5.2.0 +Release: 1%{?dist} License: GPLv2+ -URL: https://projects.kde.org/projects/extragear/base/polkit-kde-agent-1 -%if 0%{?snap:1} -## use releaseme script -Source0: polkit-kde-agent-1-0.99.1-%{snap}.tar.bz2 +URL: https://projects.kde.org/projects/kde/workspace/polkit-kde-agent-1 + +%global revision %(echo %{version} | cut -d. -f3) +%if %{revision} >= 50 +%global stable unstable %else -Source0: ftp://ftp.kde.org/pub/kde/stable/apps/KDE4.x/admin/polkit-kde-agent-1-0.99.0.tar.bz2 +%global stable stable %endif +Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz -## upstream patches -BuildRequires: kdelibs4-devel -BuildRequires: polkit-qt-devel >= 0.99.0 -BuildRequires: gettext +BuildRequires: extra-cmake-modules +BuildRequires: kf5-rpm-macros +BuildRequires: qt5-qtbase-devel -%{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} } +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: kf5-kdbusaddons-devel +BuildRequires: kf5-kwidgetsaddons-devel +BuildRequires: kf5-kcoreaddons-devel +BuildRequires: kf5-kcrash-devel +BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-kiconthemes-devel +BuildRequires: kf5-knotifications-devel + +BuildRequires: polkit-qt5-1-devel Provides: PolicyKit-authentication-agent = %{version}-%{release} Provides: polkit-kde-1 = %{version}-%{release} @@ -37,41 +47,45 @@ Provides Policy Kit Authentication Agent that nicely fits to KDE. %prep -%setup -q -n polkit-kde-agent-1-%{version} +%setup -q -n %{base_name}-%{version} %build mkdir -p %{_target_platform} pushd %{_target_platform} -%{cmake_kde4} .. +%{cmake_kf5} .. popd make %{?_smp_mflags} -C %{_target_platform} - %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%find_lang polkit-kde-authentication-agent-1 --with-kde -%find_lang polkit-kde-authentication-agent-1 - -# Plasma 5 only picks autostart from /etc/xdg/autostart, so we move it -# there so that both Plasma 5 and KDE 4 pick it up -mkdir -p %{buildroot}/etc/xdg/autostart -mv %{buildroot}/%{_datadir}/autostart/polkit-kde-authentication-agent-1.desktop \ - %{buildroot}%{_sysconfdir}/xdg/autostart/polkit-kde-authentication-agent-1.desktop +# Move the agent from libexec to libexec/kf5 +sed -i "s/Exec=\/usr\/libexec\//Exec=\/usr\/libexec\/kf5\//" %{buildroot}/%{_sysconfdir}/xdg/autostart/polkit-kde-authentication-agent-1.desktop +mkdir -p %{buildroot}/%{_kf5_libexecdir}/ +mv %{buildroot}/%{_libexecdir}/polkit-kde-authentication-agent-1 \ + %{buildroot}/%{_kf5_libexecdir} %files -f polkit-kde-authentication-agent-1.lang %doc COPYING -%{_libexecdir}/kde4/polkit-kde-authentication-agent-1 +%{_kf5_libexecdir}/polkit-kde-authentication-agent-1 %{_sysconfdir}/xdg/autostart/polkit-kde-authentication-agent-1.desktop -%{_kde4_appsdir}/policykit1-kde/policykit1-kde.notifyrc +%{_kf5_datadir}/knotifications5/policykit1-kde.notifyrc %changelog +* Mon Jan 26 2015 Daniel Vrátil - 5.2.0-1 +- Plasma 5.2.0 + * Sun Jan 25 2015 Rex Dieter 0.99.1-6.20130311git - Requires: polkit +* Tue Jan 13 2015 Daniel Vrátil - 5.1.95-1.beta +- Plasma 5.1.95 Beta + * Wed Oct 22 2014 Daniel Vrátil - 0.99.1-5.20130311git - Install autostart file to /etc/xdg/autostart so that Plasma 5 picks it up too diff --git a/sources b/sources index ad02f00..f203560 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45c836640ffa5772e50c661f9403bb2f polkit-kde-agent-1-0.99.1-20130311git.tar.bz2 +ddf92f8756141293584164c591074850 polkit-kde-agent-1-5.2.0.tar.xz