Accepting request 492687 from KDE:Frameworks5

- Update to 2.1.1:
  * Ships with correct translation files now

- Update to 2.1.0:
  * No upstream changelog provided, visit:
    https://dot.kde.org/2017/04/28/kirigami-21-out
- Remove patches, now upstream:
  * fix-license.patch

OBS-URL: https://build.opensuse.org/request/show/492687
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kirigami2?expand=0&rev=3

fix-license.patch

@@ -1,59 +0,0 @@
-From bfadb7138e071764e7a259c877dec9d93061c564 Mon Sep 17 00:00:00 2001
-From: Marco Martin <notmart@gmail.com>
-Date: Mon, 23 Jan 2017 11:58:34 +0100
-Subject: fix license header
-
-BUG:375344
----
- src/desktopicon.h | 38 ++++++++++++++++++++------------------
- 1 file changed, 20 insertions(+), 18 deletions(-)
-
-diff --git a/src/desktopicon.h b/src/desktopicon.h
-index 7c02a7d..a6bd5f1 100644
---- a/src/desktopicon.h
-+++ b/src/desktopicon.h
-@@ -1,21 +1,23 @@
--/***************************************************************************
-- *   Copyright 2011 Marco Martin <mart@kde.org>                            *
-- *                                                                         *
-- *   This program is free software; you can redistribute it and/or modify  *
-- *   it under the terms of the GNU General Public License as published by  *
-- *   the Free Software Foundation; either version 2 of the License, or     *
-- *   (at your option) any later version.                                   *
-- *                                                                         *
-- *   This program is distributed in the hope that it will be useful,       *
-- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-- *   GNU General Public License for more details.                          *
-- *                                                                         *
-- *   You should have received a copy of the GNU General Public License     *
-- *   along with this program; if not, write to the                         *
-- *   Free Software Foundation, Inc.,                                       *
-- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
-- ***************************************************************************/
-+/*
-+ *   Copyright 2011 Marco Martin <mart@kde.org>
-+ *   Copyright 2014 Aleix Pol Gonzalez <aleixpol@blue-systems.com>
-+ *
-+ *   This program is free software; you can redistribute it and/or modify
-+ *   it under the terms of the GNU Library General Public License as
-+ *   published by the Free Software Foundation; either version 2, or
-+ *   (at your option) any later version.
-+ *
-+ *   This program is distributed in the hope that it will be useful,
-+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *   GNU General Public License for more details
-+ *
-+ *   You should have received a copy of the GNU Library General Public
-+ *   License along with this program; if not, write to the
-+ *   Free Software Foundation, Inc.,
-+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+ */
-+
- #ifndef QICONITEM_H
- #define QICONITEM_H
- 
--- 
-cgit v0.11.2
-

kirigami2-2.0.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:499bfcc5080dd65877a67700ff71f84a7b43f0f87b7c72e9f68c7bb92e11a293
-size 266580

kirigami2-2.1.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ea3796058f302dabf21b7c58a05e543da5d7407414a9001d26d4318962a872ad
+size 274564

kirigami2.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed May  3 15:11:42 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 2.1.1:
+  * Ships with correct translation files now
+
+-------------------------------------------------------------------
+Sat Apr 29 14:21:27 UTC 2017 - fabian@ritter-vogt.de
+
+- Update to 2.1.0:
+  * No upstream changelog provided, visit:
+    https://dot.kde.org/2017/04/28/kirigami-21-out
+- Remove patches, now upstream:
+  * fix-license.patch
+
 -------------------------------------------------------------------
 Fri Apr 21 09:42:31 UTC 2017 - fabian@ritter-vogt.de
 

kirigami2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package kirigami2
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,13 @@
 
 %bcond_without lang
 Name:           kirigami2
-Version:        2.0.0
+Version:        2.1.1
 Release:        0
 Summary:        Set of QtQuick components
 License:        LGPL-2.1+
 Group:          Development/Libraries/KDE
 Url:            http://www.kde.org/
 Source:         http://download.kde.org/stable/kirigami/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM fix-license.patch notmart@gmail.com -- fix license header
-Patch1:         fix-license.patch
 BuildRequires:  extra-cmake-modules >= 0.0.8
 BuildRequires:  kf5-filesystem
 BuildRequires:  cmake(KF5Declarative)
@@ -34,9 +32,9 @@ BuildRequires:  cmake(KF5Plasma)
 BuildRequires:  cmake(Qt5Core) >= 5.7.0
 BuildRequires:  cmake(Qt5Gui) >= 5.7.0
 BuildRequires:  cmake(Qt5Quick) >= 5.7.0
+BuildRequires:  cmake(Qt5QuickControls2) >= 5.7.0
 BuildRequires:  cmake(Qt5Svg) >= 5.7.0
 BuildRequires:  cmake(Qt5Test) >= 5.7.0
-BuildRequires:  cmake(Qt5QuickControls2) >= 5.7.0
 Requires:       libqt5-qtquickcontrols2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with lang}
@@ -62,7 +60,6 @@ Development files.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 %cmake_kf5 -d build