diff --git a/.gitignore b/.gitignore index 0a1169a..bf74298 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /kaccounts-providers-19.08.2.tar.xz /kaccounts-providers-19.08.3.tar.xz /kaccounts-providers-19.12.1.tar.xz +/kaccounts-providers-20.04.0.tar.xz diff --git a/0001-google-provider.patch b/0001-google-provider.patch deleted file mode 100644 index 5a1dc83..0000000 --- a/0001-google-provider.patch +++ /dev/null @@ -1,50 +0,0 @@ -commit 0a71da4e3caae0defe200a85954fc7e2012010c1 -Author: Daniel Vrátil -Date: Mon Jan 13 13:48:37 2020 +0100 - - Google provider: limit requested OAuth scopes - - Summary: - Limit the scopes to what is actually permitted in the Google App settings: - contacts and calendars for future PIM integration, GDrive for KIO-GDrive, - and Youtube (upload-only) for the Purpose sharing plugin. We can extend - this in the future if needed easilly, it's easier for us to get the - Google App verified if we can proof and show how the individual scopes - are used by KDE. - - Reviewers: elvisangelaccio, bshah - - Reviewed By: elvisangelaccio, bshah - - Differential Revision: https://phabricator.kde.org/D26454 - -diff --git a/providers/google.provider.in b/providers/google.provider.in -index 638c1a9..97307af 100644 ---- a/providers/google.provider.in -+++ b/providers/google.provider.in -@@ -21,22 +21,15 @@ - order to return a refresh token --> - code - [ -- 'https://docs.google.com/feeds/', -- 'https://www.googleapis.com/auth/googletalk', -- 'https://www.googleapis.com/auth/youtube.upload', -- 'https://www.googleapis.com/auth/youtube', - 'https://www.googleapis.com/auth/userinfo.email', - 'https://www.googleapis.com/auth/userinfo.profile', -- 'https://picasaweb.google.com/data/', - 'https://www.googleapis.com/auth/calendar', -- 'https://www.google.com/m8/feeds/', - 'https://www.googleapis.com/auth/tasks', -+ 'https://www.google.com/m8/feeds/', - 'https://www.googleapis.com/auth/drive', -- 'https://www.googleapis.com/auth/drive.file', -- 'https://www.googleapis.com/auth/drive.metadata.readonly', -- 'https://www.googleapis.com/auth/drive.readonly' -+ 'https://www.googleapis.com/auth/youtube.upload' - ] -- ['https','http'] -+ ['https'] - 317066460457-pkpkedrvt2ldq6g2hj1egfka2n7vpuoo.apps.googleusercontent.com - Y8eFAaWfcanV3amZdDvtbYUq - true diff --git a/kaccounts-providers.spec b/kaccounts-providers.spec index d5ffb21..0dc95a7 100644 --- a/kaccounts-providers.spec +++ b/kaccounts-providers.spec @@ -1,6 +1,6 @@ Name: kaccounts-providers -Version: 19.12.1 -Release: 3%{?dist} +Version: 20.04.0 +Release: 1%{?dist} Summary: Additional service providers for KAccounts framework License: GPLv2 URL: https://cgit.kde.org/%{name}.git @@ -11,9 +11,7 @@ URL: https://cgit.kde.org/%{name}.git %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz - -Patch0: 0001-google-provider.patch +Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: intltool @@ -34,6 +32,7 @@ Obsoletes: kaccounts-providers < 15.12.0 %description %{summary}. + %prep %autosetup -p1 @@ -44,7 +43,7 @@ pushd %{_target_platform} %{cmake_kf5} .. popd -make %{?_smp_mflags} -C %{_target_platform} +%make_build -C %{_target_platform} %install @@ -66,6 +65,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Sat May 02 2020 Rex Dieter - 20.04.0-1 +- 20.04.0 + * Wed Jan 29 2020 Fedora Release Engineering - 19.12.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 2bba9f4..9c80270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kaccounts-providers-19.12.1.tar.xz) = 03b88b02cda919aacf8ae460ce896ec8c3a7baeec838f428f1cc225b8632e7e1450ca5aae1496dcf52c0bf90614bdc179ea2234faf0baacc14faed9a2db0f9f8 +SHA512 (kaccounts-providers-20.04.0.tar.xz) = 679e6825141f10844cabd6cef25134d690cc2a073c25e1adb14dd9b744117ad94c346d3214a67b9b755a7a1b852bc1208cf4aff9d4dbea5d8472f1bab25c1f4f