Fix remaining merge code

Merge branch 'master' into f33
Make the package build with updated %%cmake macro (#1865556 )
2020-12-14 23:54:43 -06:00 · 2020-12-14 14:48:15 -06:00 · 2020-10-01 23:08:11 +02:00
1 changed files with 3 additions and 0 deletions
--- a/sword.spec
+++ b/sword.spec
@ -158,6 +158,9 @@ make tests
 * Fri Oct 2 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.903-1
 - Upstream 1.9.0RC3 release

+* Thu Oct 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-25
+- Make the package build with updated %%cmake macro (#1865556)
+
 * Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
 - Upstream 1.9.0RC1 release
Author	SHA1	Message	Date
Gregory Hellings	1bdf78c2ce	Fix remaining merge code	2020-12-14 23:54:43 -06:00
Gregory Hellings	248daffc9b	Merge branch 'master' into f33	2020-12-14 14:48:15 -06:00
Jitka Plesnikova	661d401aac	Make the package build with updated %%cmake macro (#1865556 )	2020-10-01 23:08:11 +02:00