From 50738b87e040023c88bb2324188c8b5124a05e96 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 11 Mar 2022 10:57:47 +0100 Subject: [PATCH 01/13] Rebuild (qt5) --- kf5-kirigami2-addons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 86dd5d6..d4f76b2 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Fri Mar 11 2022 Jan Grulich - 21.05-4 +- Rebuild (qt5) + * Thu Jan 20 2022 Fedora Release Engineering - 21.05-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 7b93118fab2fb2799033cb9e60e5f86e9e7564dc Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:19:37 -0700 Subject: [PATCH 02/13] Revert back --- kf5-kirigami2-addons.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index d4f76b2..31b3ef4 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 4%{?dist} +Release: 2%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,12 +66,6 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog -* Fri Mar 11 2022 Jan Grulich - 21.05-4 -- Rebuild (qt5) - -* Thu Jan 20 2022 Fedora Release Engineering - 21.05-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - * Thu Jul 22 2021 Fedora Release Engineering - 21.05-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From bceb4b485f4b37dde9eb967757200a9ecc244539 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:21:03 -0700 Subject: [PATCH 03/13] Rebuild for qt5-5.15.3 --- kf5-kirigami2-addons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 31b3ef4..3c62ff5 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Tue Apr 26 2022 Troy Dawson - 21.05-3 +- Rebuild for qt5-5.15.3 + * Thu Jul 22 2021 Fedora Release Engineering - 21.05-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8f9668893564908a7bc666c8a72065be5162db6a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:50:11 -0700 Subject: [PATCH 04/13] Revert "Rebuild for qt5-5.15.3" This reverts commit bceb4b485f4b37dde9eb967757200a9ecc244539. --- kf5-kirigami2-addons.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 3c62ff5..31b3ef4 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 3%{?dist} +Release: 2%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,9 +66,6 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog -* Tue Apr 26 2022 Troy Dawson - 21.05-3 -- Rebuild for qt5-5.15.3 - * Thu Jul 22 2021 Fedora Release Engineering - 21.05-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 30c1eaab5adba6d1f223add00168c2aa03fdacd2 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Tue, 26 Apr 2022 09:50:13 -0700 Subject: [PATCH 05/13] Revert "Revert back" This reverts commit 7b93118fab2fb2799033cb9e60e5f86e9e7564dc. --- kf5-kirigami2-addons.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 31b3ef4..d4f76b2 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 2%{?dist} +Release: 4%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,12 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Fri Mar 11 2022 Jan Grulich - 21.05-4 +- Rebuild (qt5) + +* Thu Jan 20 2022 Fedora Release Engineering - 21.05-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 21.05-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 242407241ab9f76b02426fa06a04c177aeaa9434 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 17 May 2022 13:03:34 +0200 Subject: [PATCH 06/13] Rebuild (qt5) --- kf5-kirigami2-addons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index d4f76b2..c10982b 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Tue May 17 2022 Jan Grulich - 21.05-5 +- Rebuild (qt5) + * Fri Mar 11 2022 Jan Grulich - 21.05-4 - Rebuild (qt5) From 21a2042b6a88ea0215921bc2254bebfc1068b6ca Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 15:03:24 +0200 Subject: [PATCH 07/13] Rebuild (qt5) --- kf5-kirigami2-addons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index c10982b..85452b4 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Thu Jul 14 2022 Jan Grulich - 21.05-6 +- Rebuild (qt5) + * Tue May 17 2022 Jan Grulich - 21.05-5 - Rebuild (qt5) From 680285d4aade55b35420c7454b091af9ed3d35c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 16:04:53 +0000 Subject: [PATCH 08/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kf5-kirigami2-addons.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 85452b4..7610147 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 21.05 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons @@ -66,6 +66,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 21.05-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 14 2022 Jan Grulich - 21.05-6 - Rebuild (qt5) From c23d3e5961ce68862a3d7967b1ed8f690e675c3d Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 28 Sep 2022 17:38:38 +0930 Subject: [PATCH 09/13] Update to 0.4 --- .gitignore | 1 + kf5-kirigami2-addons.spec | 26 +++++++++++++++----------- sources | 1 + 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 34639c1..4ece20e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kirigami-addons-release-21.05.tar.gz +/kirigami-addons-v0.4.tar.gz diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 7610147..a46407a 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -1,25 +1,24 @@ %global orig_name kirigami-addons Name: kf5-kirigami2-addons -Version: 21.05 -Release: 7%{?dist} +Version: 0.4 +Release: 1%{?dist} +Epoch: 1 License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications Url: https://invent.kde.org/libraries/kirigami-addons -Source: https://invent.kde.org/libraries/%{orig_name}/-/archive/release/%{version}/%{orig_name}-release-%{version}.tar.gz +Source: https://invent.kde.org/libraries/%{orig_name}/-/archive/v%{version}/%{orig_name}-v%{version}.tar.gz - -BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ BuildRequires: kf5-rpm-macros - -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Quick) -BuildRequires: cmake(Qt5QuickControls2) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5Kirigami2) +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Quick) +BuildRequires: cmake(Qt5QuickControls2) %description A set of "widgets" i.e visual end user components along with a @@ -43,7 +42,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Tree view Kirigami addon, which is useful for listing files. %prep -%autosetup -n %{orig_name}-release-%{version} +%autosetup -n %{orig_name}-v%{version} %build %cmake @@ -57,6 +56,8 @@ Tree view Kirigami addon, which is useful for listing files. %license LICENSES/ %dir %{_kf5_qmldir}/org/kde %dir %{_kf5_qmldir}/org/kde/kirigamiaddons +%{_kf5_libdir}/qt5/qml/org/kde/kirigamiaddons/* +%{_kf5_libdir}/cmake/KF5KirigamiAddons/* %files dateandtime @@ -66,6 +67,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Wed Sep 28 2022 Justin Zobel - 0.4-1 +- Update to 0.4 + * Thu Jul 21 2022 Fedora Release Engineering - 21.05-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild @@ -85,4 +89,4 @@ Tree view Kirigami addon, which is useful for listing files. - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * Sat May 15 2021 Onuralp SEZER - 21.05-1 -- initial version of package \ No newline at end of file +- initial version of package diff --git a/sources b/sources index 3c447f9..438ec84 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (kirigami-addons-release-21.05.tar.gz) = 078ce77c5cde2772af4a2ce69fafddb87b9cfb7d61ae0c82cef564baafaf1ee6aa511bffb707f82436c2cf0c527189e7d7f2801ffecd675a007376599da8ca46 +SHA512 (kirigami-addons-v0.4.tar.gz) = 49a20503254c662c6efc046ce7ff85ee954fedaeb9816c2dec9884d70045233c3697730d5ff16ae9fb315311544addc0b090f76a32283aa9972f1e7d5202417c From 1d426c21d7952bd427315f3c1974cdb6686c4f34 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 29 Sep 2022 17:28:33 +0930 Subject: [PATCH 10/13] Subpackages need epoch to depend on the main package correctly --- kf5-kirigami2-addons.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index a46407a..8714f79 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications @@ -29,7 +29,7 @@ or Plasma). %package dateandtime Summary: Date and time add-on for the Kirigami framework -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description dateandtime Date and time Kirigami addons, which complements other @@ -37,7 +37,7 @@ software like Kclock. %package treeview Summary: Tree view add-on for the Kirigami framework -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description treeview Tree view Kirigami addon, which is useful for listing files. From fc8b04c63155b018f96f0ca8f8f5c27ebd55055c Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Thu, 29 Sep 2022 18:03:17 +0930 Subject: [PATCH 11/13] Subpackages need epoch to depend on the main package correctly --- kf5-kirigami2-addons.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index a46407a..8714f79 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -2,7 +2,7 @@ Name: kf5-kirigami2-addons Version: 0.4 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications @@ -29,7 +29,7 @@ or Plasma). %package dateandtime Summary: Date and time add-on for the Kirigami framework -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description dateandtime Date and time Kirigami addons, which complements other @@ -37,7 +37,7 @@ software like Kclock. %package treeview Summary: Tree view add-on for the Kirigami framework -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %description treeview Tree view Kirigami addon, which is useful for listing files. From b66438890a33e68b9e4836e1b98fa2e9a63f12b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 30 Nov 2022 16:17:13 +0100 Subject: [PATCH 12/13] feat: upgrade to 0.6 --- kf5-kirigami2-addons.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kf5-kirigami2-addons.spec b/kf5-kirigami2-addons.spec index 8714f79..9e01a16 100644 --- a/kf5-kirigami2-addons.spec +++ b/kf5-kirigami2-addons.spec @@ -1,8 +1,8 @@ %global orig_name kirigami-addons Name: kf5-kirigami2-addons -Version: 0.4 -Release: 2%{?dist} +Version: 0.6 +Release: 1%{?dist} Epoch: 1 License: LGPLv3 Summary: Convergent visual components ("widgets") for Kirigami-based applications @@ -50,8 +50,9 @@ Tree view Kirigami addon, which is useful for listing files. %install %cmake_install +%find_lang %{orig_name} --all-name -%files +%files -f %{orig_name}.lang %doc README.md %license LICENSES/ %dir %{_kf5_qmldir}/org/kde @@ -67,6 +68,9 @@ Tree view Kirigami addon, which is useful for listing files. %{_kf5_qmldir}/org/kde/kirigamiaddons/treeview/ %changelog +* Wed Nov 30 2022 Marc Deop - 1:0.6-1 +- 0.6 + * Wed Sep 28 2022 Justin Zobel - 0.4-1 - Update to 0.4 From f5e5b41fc472cbde91cc7faf53437f3dab2db19a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Wed, 30 Nov 2022 16:27:08 +0100 Subject: [PATCH 13/13] fix: upload new-sources --- .gitignore | 1 + sources | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4ece20e..ef5fe80 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kirigami-addons-release-21.05.tar.gz /kirigami-addons-v0.4.tar.gz +/kirigami-addons-v0.6.tar.gz diff --git a/sources b/sources index 438ec84..3eef553 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (kirigami-addons-release-21.05.tar.gz) = 078ce77c5cde2772af4a2ce69fafddb87b9cfb7d61ae0c82cef564baafaf1ee6aa511bffb707f82436c2cf0c527189e7d7f2801ffecd675a007376599da8ca46 -SHA512 (kirigami-addons-v0.4.tar.gz) = 49a20503254c662c6efc046ce7ff85ee954fedaeb9816c2dec9884d70045233c3697730d5ff16ae9fb315311544addc0b090f76a32283aa9972f1e7d5202417c +SHA512 (kirigami-addons-v0.6.tar.gz) = 73e6aeabb6f4f153060db1475764b63ddc33b8c199a7298fb843bc99a29a9c36931611a2f5df16f7f0be95503c87fcabdb826003670f5ef3b1cc86bfa790fe09