From 83bba66d695e210a63367575188795d6a3ef9201 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 8 Jan 2018 22:15:47 -0600 Subject: [PATCH] Upstream version 1.8.1 --- .gitignore | 4 ++++ sources | 2 +- sword-1.8.1-cmake.diff | 13 +++++++++++++ sword.spec | 31 ++++++++++++++++++++++++------- 4 files changed, 42 insertions(+), 8 deletions(-) create mode 100644 sword-1.8.1-cmake.diff diff --git a/.gitignore b/.gitignore index cd2e05d..83ee683 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,10 @@ +*.swp +*.rpm +results_sword sword-1.6.1.tar.gz /sword-1.6.2.tar.gz /sword-1.7.2.tar.gz /sword-1.7.3.tar.gz /sword-1.7.3.900.tar.gz /sword-1.7.4.tar.gz +/sword-1.8.1.tar.gz diff --git a/sources b/sources index c5cf692..0443583 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1677f02a86cbf07713d4e1d4c39791e6 sword-1.7.4.tar.gz +SHA512 (sword-1.8.1.tar.gz) = 5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 diff --git a/sword-1.8.1-cmake.diff b/sword-1.8.1-cmake.diff new file mode 100644 index 0000000..5d5eeba --- /dev/null +++ b/sword-1.8.1-cmake.diff @@ -0,0 +1,13 @@ +diff --git a/cmake/options.cmake b/cmake/options.cmake +index 81981c8..19b7004 100644 +--- a/cmake/options.cmake ++++ b/cmake/options.cmake +@@ -44,7 +44,7 @@ _SET_FANCY(SYSCONF_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc" "Directory to insta + + _SET_FANCY(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/share" "Directory to install global data files. Defaults to ${SWORD_INSTALL_DIR}/share.") + +-_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" CACHE STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") ++_SET_FANCY(SWORD_PYTHON_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" STRING "Directory where the Python bindings will be installed. Defaults to default Python path.") + + # Post-processing of variables + MACRO(PROCESS_VERSION LEVEL VALUE) diff --git a/sword.spec b/sword.spec index df31a62..d5b2ecd 100644 --- a/sword.spec +++ b/sword.spec @@ -1,12 +1,13 @@ -%define soversion 1.7 +%define soversion 1.8 -Name: sword -Version: 1.7.4 -Release: 12%{?dist} +Name: sword +Version: 1.8.1 +Release: 1%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-%{version}.tar.gz +Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-%{version}.tar.gz +Patch0: sword-1.8.1-cmake.diff BuildRequires: cmake BuildRequires: openssl-devel BuildRequires: curl-devel @@ -62,15 +63,18 @@ Python bindings for The SWORD Library. %prep %setup -q +%patch0 -p1 %build mkdir build pushd build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_BINDINGS="Python" \ - -DBUILD_UTILITIES="Yes" \ + -DSWORD_BUILD_UTILITIES="Yes" \ -DLIBSWORD_SOVERSION=%{soversion} \ -DLIBDIR=%{_libdir} \ + -DSWORD_BUILD_TESTS=Yes \ + -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" \ .. make %{?_smp_mflags} @@ -86,6 +90,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %postun -p /sbin/ldconfig +%check +make tests + %files %doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README %doc samples doc @@ -125,9 +132,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %{python2_sitearch}/Sword.pyc %{python2_sitearch}/Sword.pyo %{python2_sitearch}/_Sword.so -%{python2_sitearch}/sword-%{version}-py2.7.egg-info +%{python2_sitearch}/sword-%{version}-py%{python2_version}.egg-info %changelog +* Mon Jan 08 2018 Greg Hellings - 1.8.1-1 +- Upstream release 1.8.1 +- Add check section + +* Sat Dec 23 2017 Greg Hellings - 1.8.0-1 +- Upstream release 1.8.0 + +* Tue Dec 5 2017 Greg Hellings - 1.7.906-1 +- Testing 1.8.0RC6 + * Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild