Merge branch 'rawhide' into f36

3 years ago · 61133c6491
parent 9360f19ff2 fa976dd34b
commit 61133c6491
3 changed files with 9 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -46,3 +46,4 @@
 /ki18n-5.92.0.tar.xz
 /ki18n-5.93.0.tar.xz
 /ki18n-5.94.0.tar.xz
+/ki18n-5.96.0.tar.xz
--- a/kf5-ki18n.spec
+++ b/kf5-ki18n.spec
@ -1,7 +1,7 @@
 %global framework ki18n

 Name:    kf5-%{framework}
-Version: 5.94.0
+Version: 5.96.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 Tier 1 addon for localization

@ -100,6 +100,12 @@ developing applications that use %{name}.


 %changelog
+* Sun Jul 03 2022 Marc Deop <marcdeop@fedoraproject.org> - 5.96.0-1
+- 5.96.0
+
+* Tue May 17 2022 Jan Grulich <jgrulich@redhat.com> - 5.94.0-2
+- Rebuild (qt5)
+
 * Fri May 13 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.94.0-1
 - 5.94.0

@ -110,7 +116,6 @@ developing applications that use %{name}.
 - 5.92.0

 * Tue Mar 08 2022 Jan Grulich <jgrulich@redhat.com> - 5.91.0-2
->>>>>>> rawhide
 - Rebuild (qt5)

 * Fri Feb 11 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.91.0-1
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (ki18n-5.94.0.tar.xz) = ff00a56f1d6e5a425d025320be6f6e1559e329f56e68975df9d7c1ecdc0108f2118af37373db583d7760f34877bd0f18bef47080a70dfca628d958f35e8f9e15
+SHA512 (ki18n-5.96.0.tar.xz) = ab059bd98ce16e20a803f7597ae0e5e3698f6b5ccbcd846131a8c8b0d02201ca9a61ed67ecf93cb2931ac347d3e13d5515079643c2cbbec39b0fe8139de17216