Merge branch f34 into epel8

.gitignore

@@ -20,3 +20,19 @@
 /kwallet-5.66.0.tar.xz
 /kwallet-5.67.0.tar.xz
 /kwallet-5.68.0.tar.xz
+/kwallet-5.69.0.tar.xz
+/kwallet-5.70.0.tar.xz
+/kwallet-5.71.0.tar.xz
+/kwallet-5.72.0.tar.xz
+/kwallet-5.73.0.tar.xz
+/kwallet-5.74.0.tar.xz
+/kwallet-5.75.0.tar.xz
+/kwallet-5.76.0.tar.xz
+/kwallet-5.77.0.tar.xz
+/kwallet-5.78.0.tar.xz
+/kwallet-5.79.0.tar.xz
+/kwallet-5.80.0.tar.xz
+/kwallet-5.81.0.tar.xz
+/kwallet-5.82.0.tar.xz
+/kwallet-5.83.0.tar.xz
+/kwallet-5.85.0.tar.xz

kf5-kwallet.spec

@@ -1,3 +1,4 @@
+%undefine __cmake_in_source_build
 %global framework kwallet
 
 # uncomment to enable bootstrap mode
@@ -8,12 +9,12 @@
 %endif
 
 Name:    kf5-%{framework}
-Version: 5.68.0
+Version: 5.85.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 3 solution for password management
 
 License: LGPLv2+
-URL:     https://cgit.kde.org/%{framework}.git
+URL:     https://invent.kde.org/frameworks/%{framework}
 
 %global majmin %(echo %{version} | cut -d. -f1-2)
 %global revision %(echo %{version} | cut -d. -f3)
@@ -22,12 +23,13 @@ URL:     https://cgit.kde.org/%{framework}.git
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
 
 ## upstream patches
 
 ## upstreamable patches
 
+BuildRequires: make
 BuildRequires:  extra-cmake-modules >= %{majmin}
 BuildRequires:  kf5-kconfig-devel >= %{majmin}
 BuildRequires:  kf5-kconfigwidgets-devel >= %{majmin}
@@ -84,17 +86,13 @@ developing applications that use %{name}.
 
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
-%{cmake_kf5} .. \
+%{cmake_kf5} \
   -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
-popd
-
-%make_build -C %{_target_platform}
+%cmake_build
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%cmake_install
 
 %find_lang %{name} --all-name --with-man
 
@@ -108,7 +106,7 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 %files -f %{name}.lang
 %doc README.md
-%license COPYING.LIB
+%license LICENSES/*.txt
 %{_kf5_datadir}/qlogging-categories5/%{framework}*
 %{_kf5_datadir}/dbus-1/services/org.kde.kwalletd5.service
 %{_kf5_bindir}/kwalletd5
@@ -134,6 +132,69 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Aug 12 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.85.0-1
+- 5.85.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.83.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 08 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.83.0-1
+- 5.83.0
+
+* Mon May 03 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.82.0-1
+- 5.82.0
+
+* Tue Apr 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.81.0-1
+- 5.81.0
+
+* Tue Mar 09 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.80.0-1
+- 5.80.0
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-2
+- respin
+
+* Sat Feb 06 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.79.0-1
+- 5.79.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.78.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Jan 16 2021 Marc Deop marcdeop@fedoraproject.org - 5.78.0-2
+- Fix Source0 url
+
+* Mon Jan  4 08:55:58 CST 2021 Rex Dieter <rdieter@fedoraproject.org> - 5.78.0-1
+- 5.78.0
+
+* Sun Dec 13 14:19:52 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.77.0-1
+- 5.77.0
+
+* Thu Nov 19 09:12:35 CST 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.76.0-1
+- 5.76.0
+
+* Wed Oct 14 10:05:55 CDT 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.75.0-1
+- 5.75.0
+
+* Fri Sep 18 2020 Jan Grulich <jgrulich@redhat.com> - 5.74.0-1
+- 5.74.0
+
+* Mon Aug 03 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.73.0-1
+- 5.73.0
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.72.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 07 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.72.0-1
+- 5.72.0
+
+* Tue Jun 16 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.71.0-1
+- 5.71.0
+
+* Mon May 04 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.70.0-1
+- 5.70.0
+
+* Tue Apr 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.69.0-1
+- 5.69.0
+
 * Fri Mar 20 2020 Rex Dieter <rdieter@fedoraproject.org> - 5.68.0-1
 - 5.68.0
 

sources

@@ -1 +1 @@
-SHA512 (kwallet-5.68.0.tar.xz) = a0a410a9040cb8f157ff01cfbc976f49dac90d0fda0b4dbc8e760cb0549073ed9be5d442bde03b4f6bf27aa16a397671a1a0285c179aea3760bbf441e22cf004
+SHA512 (kwallet-5.85.0.tar.xz) = 7cead5cac3856ad08a71778e44ba57cecdc97cbd2abe3ec33d461edd95a8fce742ec011b8773841cc5f24d8eb282a197d462e979829c62d477c87625c5107c10