From 0de7e39796cfde19d0fc7ded43237c82d3df648bde3a4351af1e8298a2a3df47 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:25:24 +0000 Subject: [PATCH 1/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=9 --- kirigami2.changes | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kirigami2.changes b/kirigami2.changes index 95198e7..bd2077c 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 From 96ce1f254e4de89df7b278f95ef2a0ce45f61612ed5bf97e13d9c314cbdd0781 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:25:56 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=10 --- kirigami2.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kirigami2.spec b/kirigami2.spec index 6066f3e..89a89b2 100644 --- a/kirigami2.spec +++ b/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.0 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) @@ -62,7 +60,6 @@ Development files. %prep %setup -q -%patch1 -p1 %build %cmake_kf5 -d build From c8f368157a7e90705e9dfabe4cc2d1b3fe3fd8641c723bc745cc18cb0a89acda Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:26:02 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=11 --- kirigami2-2.0.0.tar.xz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 kirigami2-2.0.0.tar.xz diff --git a/kirigami2-2.0.0.tar.xz b/kirigami2-2.0.0.tar.xz deleted file mode 100644 index 934f6c6..0000000 --- a/kirigami2-2.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:499bfcc5080dd65877a67700ff71f84a7b43f0f87b7c72e9f68c7bb92e11a293 -size 266580 From 2148ac42f0954d80c13e83a2112d6ded28bf68a14d11e8ff5488c0abfcfdef71 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:26:16 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=12 --- kirigami2-2.1.0.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 kirigami2-2.1.0.tar.xz diff --git a/kirigami2-2.1.0.tar.xz b/kirigami2-2.1.0.tar.xz new file mode 100644 index 0000000..9b3f498 --- /dev/null +++ b/kirigami2-2.1.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e744ff974ef100d23feda68f3fdb465aa56bf8da6992ab7e3f3fed2f4180e934 +size 274808 From 8df271873e04e38d72e707d0e4b58b30ccf2ed9820b529744c1048e5f4777786 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:30:57 +0000 Subject: [PATCH 5/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=13 --- kirigami2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kirigami2.spec b/kirigami2.spec index 89a89b2..f0c1bfb 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -69,11 +69,11 @@ Development files. %kf5_makeinstall -C build %if %{with lang} -%find_lang libkirigami2plugin --with-qt --without-mo +%find_lang desktop_extragear-libs_kirigami --with-qt --without-mo %endif %if %{with lang} -%files lang -f libkirigami2plugin.lang +%files lang -f desktop_extragear-libs_kirigami.lang %endif %files From 064b8acc460e477a312fbe0c6a84741144e85fdce7931794eb45d5682f4422d2 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:33:51 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=14 --- kirigami2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kirigami2.spec b/kirigami2.spec index f0c1bfb..86223f4 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -69,7 +69,7 @@ Development files. %kf5_makeinstall -C build %if %{with lang} -%find_lang desktop_extragear-libs_kirigami --with-qt --without-mo +%find_lang desktop_extragear-libs_kirigami --all-name -with-qt --without-mo %endif %if %{with lang} From aaa3bb8d3a2b72d0da0a2b725829351ba1165391c9be514b14fe2248dc7cd0fa Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sat, 29 Apr 2017 14:35:44 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=15 --- kirigami2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kirigami2.spec b/kirigami2.spec index 86223f4..f9d21e3 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -69,7 +69,7 @@ Development files. %kf5_makeinstall -C build %if %{with lang} -%find_lang desktop_extragear-libs_kirigami --all-name -with-qt --without-mo +%find_lang desktop_extragear-libs_kirigami --all-name --with-qt --without-mo %endif %if %{with lang} From a9e052801b1b78efe9118569c7a89b7bf5398c3bdddcb43104309a5c6005a6bc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 3 May 2017 15:12:33 +0000 Subject: [PATCH 8/9] - Update to 2.1.1: * Ships with correct translation files now OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=17 --- kirigami2-2.1.0.tar.xz | 3 --- kirigami2-2.1.1.tar.xz | 3 +++ kirigami2.changes | 6 ++++++ kirigami2.spec | 8 ++++---- 4 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 kirigami2-2.1.0.tar.xz create mode 100644 kirigami2-2.1.1.tar.xz diff --git a/kirigami2-2.1.0.tar.xz b/kirigami2-2.1.0.tar.xz deleted file mode 100644 index 9b3f498..0000000 --- a/kirigami2-2.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e744ff974ef100d23feda68f3fdb465aa56bf8da6992ab7e3f3fed2f4180e934 -size 274808 diff --git a/kirigami2-2.1.1.tar.xz b/kirigami2-2.1.1.tar.xz new file mode 100644 index 0000000..d483ebf --- /dev/null +++ b/kirigami2-2.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea3796058f302dabf21b7c58a05e543da5d7407414a9001d26d4318962a872ad +size 274564 diff --git a/kirigami2.changes b/kirigami2.changes index bd2077c..69d068c 100644 --- a/kirigami2.changes +++ b/kirigami2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/kirigami2.spec b/kirigami2.spec index f9d21e3..9520b89 100644 --- a/kirigami2.spec +++ b/kirigami2.spec @@ -18,7 +18,7 @@ %bcond_without lang Name: kirigami2 -Version: 2.1.0 +Version: 2.1.1 Release: 0 Summary: Set of QtQuick components License: LGPL-2.1+ @@ -32,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} @@ -69,11 +69,11 @@ Development files. %kf5_makeinstall -C build %if %{with lang} -%find_lang desktop_extragear-libs_kirigami --all-name --with-qt --without-mo +%find_lang libkirigami2plugin --with-qt --without-mo %endif %if %{with lang} -%files lang -f desktop_extragear-libs_kirigami.lang +%files lang -f libkirigami2plugin.lang %endif %files From c44b3b4bc060579f633ff4c874fbf0fb90d8361c7afadfa5ba6a4fbd99b64ea7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 3 May 2017 15:17:36 +0000 Subject: [PATCH 9/9] Remove fix-license.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kirigami2?expand=0&rev=18 --- fix-license.patch | 59 ----------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 fix-license.patch diff --git a/fix-license.patch b/fix-license.patch deleted file mode 100644 index a30f6b2..0000000 --- a/fix-license.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bfadb7138e071764e7a259c877dec9d93061c564 Mon Sep 17 00:00:00 2001 -From: Marco Martin -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 * -- * * -- * 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 -+ * Copyright 2014 Aleix Pol Gonzalez -+ * -+ * 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 -