From 661d401aac59763729575d8ef1e34b714d1446d1 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Thu, 1 Oct 2020 23:08:11 +0200
Subject: [PATCH 1/2] Make the package build with updated %%cmake macro
 (#1865556)

---
 sword.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sword.spec b/sword.spec
index 4d3bf85..9039eed 100644
--- a/sword.spec
+++ b/sword.spec
@@ -2,7 +2,7 @@
 
 Name:           sword
 Version:        1.8.1
-Release:        24%{?dist}
+Release:        25%{?dist}
 Summary:        Free Bible Software Project
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
@@ -101,7 +101,7 @@ pushd build
        -DLIBDIR=%{_libdir} \
        -DSWORD_BUILD_TESTS=Yes \
        -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \
-       ..
+       .. -B .
 make %{?_smp_mflags}
 
 %install
@@ -162,6 +162,9 @@ make tests
 
 
 %changelog
+* Thu Oct 01 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.8.1-25
+- Make the package build with updated %%cmake macro (#1865556)
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-24
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From 1bdf78c2ceb129b8cf40b8b82b487da41d3f1cd7 Mon Sep 17 00:00:00 2001
From: Gregory Hellings <greg.hellings@gmail.com>
Date: Mon, 14 Dec 2020 23:54:43 -0600
Subject: [PATCH 2/2] Fix remaining merge code

---
 sword.spec | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sword.spec b/sword.spec
index 1485593..7f07807 100644
--- a/sword.spec
+++ b/sword.spec
@@ -91,14 +91,8 @@ Perl bindings for The SWORD Library.
        -DLIBSWORD_SOVERSION=%{soversion} \
        -DLIBDIR=%{_libdir} \
        -DSWORD_BUILD_TESTS=Yes \
-<<<<<<< HEAD
-       -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \
-       .. -B .
-make %{?_smp_mflags}
-=======
        -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}"
 %cmake_build
->>>>>>> master
 
 %install
 %cmake_install
@@ -164,12 +158,12 @@ make tests
 * Fri Oct 2 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.903-1
 - Upstream 1.9.0RC3 release
 
-* Fri Sep 11 2020 Greg Hellings <greg.hellings@gmail.com> - 1.8.901-1
-- Upstream 1.9.0RC1 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
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.1-24
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild