From ec2d653471c1a347d5956bb1e5259529bd1b1f3b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:54:52 +0200 Subject: [PATCH 01/27] Rebuilt for Python 3.12 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 97b2c8d..a74bb59 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 +- Rebuilt for Python 3.12 + * Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 65f444fb04f15e025cc4e1f0cb75ed9f1e3f294c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 30 Jun 2023 12:04:16 +0200 Subject: [PATCH 02/27] Replace requirement of meta-package perl by perl-interpreter --- sword.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sword.spec b/sword.spec index a74bb59..435b548 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -74,7 +74,7 @@ Python bindings for The SWORD Library. %{?perl_provide:%perl_provide perl-sword} Summary: Perl bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl +Requires: perl-interpreter Requires: perl-XML-LibXML Requires: perl-HTML-Strip @@ -84,7 +84,7 @@ Perl bindings for The SWORD Library. %prep %setup -q -%patch0 -p1 -b .perl +%patch -P0 -p1 -b .perl %build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ @@ -151,6 +151,9 @@ make tests %changelog +* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 +- Replace requirement of meta-package perl by perl-interpreter + * Tue Jun 13 2023 Python Maint - 1:1.9.0-17 - Rebuilt for Python 3.12 From 202d0fd0e1bc677803e8eb8c8da7faa94b912ad9 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 15:29:44 +0200 Subject: [PATCH 03/27] Perl 5.38 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 435b548..8733e4d 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 +- Perl 5.38 rebuild + * Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 - Replace requirement of meta-package perl by perl-interpreter From 2d7873622a01c8f8271221820e1004909f792fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Tue, 11 Jul 2023 22:22:19 +0200 Subject: [PATCH 04/27] Rebuilt for ICU 73.2 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 8733e4d..aafeca0 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 +- Rebuilt for ICU 73.2 + * Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 - Perl 5.38 rebuild From ec35210df3712b4e9d0dcbd6932fadb9b2da99ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 02:58:09 +0000 Subject: [PATCH 05/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index aafeca0..4d8a0cb 100644 --- a/sword.spec +++ b/sword.spec @@ -4,7 +4,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Free Bible Software Project License: GPLv2 URL: http://www.crosswire.org/sword/ @@ -151,6 +151,9 @@ make tests %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 - Rebuilt for ICU 73.2 From 196b7b658cf800892419a0dc82022ef82c586984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 Sep 2023 12:05:27 +0200 Subject: [PATCH 06/27] Retired: Fails to install See https://pagure.io/releng/issue/11685 --- .gitignore | 13 - cmake-perl-bindings.diff | 105 -------- dead.package | 3 + sources | 1 - sword.spec | 520 --------------------------------------- tests/installmgr.sh | 7 - tests/tests.yml | 10 - 7 files changed, 3 insertions(+), 656 deletions(-) delete mode 100644 .gitignore delete mode 100644 cmake-perl-bindings.diff create mode 100644 dead.package delete mode 100644 sources delete mode 100644 sword.spec delete mode 100755 tests/installmgr.sh delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index eb752e7..0000000 --- a/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -*.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 -/sword-1.9.0RC1.tar.gz -/sword-1.9.0RC3.tar.gz -/sword-1.9.0.tar.gz diff --git a/cmake-perl-bindings.diff b/cmake-perl-bindings.diff deleted file mode 100644 index ea6710a..0000000 --- a/cmake-perl-bindings.diff +++ /dev/null @@ -1,105 +0,0 @@ -diff -bru a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt ---- a/bindings/swig/perl/CMakeLists.txt 2020-07-29 18:59:48.000000000 +0200 -+++ b/bindings/swig/perl/CMakeLists.txt 2020-11-01 19:56:20.825016280 +0100 -@@ -1,68 +1,35 @@ --# This method works but there is no good way to install the results of it --#FIND_PACKAGE(PerlLibs REQUIRED) --#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) --# --#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) --#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") --# --#SWIG_ADD_MODULE(Sword perl --# "../sword.i" --#) --# --#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) -- --FIND_PACKAGE(Perl REQUIRED) -- --SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} -- --use ExtUtils::MakeMaker; -- --# See lib/ExtUtils/MakeMaker.pm for details of how to influence --# the contents of the Makefile that is written --WriteMakefile( -- 'NAME' => 'Sword', -- 'VERSION' => '${SWORD_VERSION}', -- 'INC' => '-I\"${CMAKE_SOURCE_DIR}/include\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/..\"', -- 'DEFINE' => '-DSWIG', -- 'LIBS' => '-L\"${CMAKE_BINARY_DIR}\" -lsword -lz', -- 'FIRST_MAKEFILE' => 'Makefile.perlswig', -- 'PREREQ_PM' => {}, -- ($] >= 5.005 ? ## Add these new keywords supported since 5.005 -- (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module -- AUTHOR => 'Sword Project ') : ()), --); -- --rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; --open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; --while () { -- s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; -- print OUTPUT \"$_\"; --} -- --close INPUT; --close OUTPUT;") --FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") -- --SET(SKIP_MAKEFILE "\\.old --~$ --\\.bak --^CVS --Makefile$") --FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") -- --SWORD_SWIG_GENERATE(perl) -- --ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig -- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean -- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -- --ADD_CUSTOM_TARGET(perlswig ALL -- COMMAND make -f Makefile.perlswig -- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -+# Perl Swig bindings - --INSTALL(SCRIPT install.cmake) -+cmake_minimum_required(VERSION 3.14.7) -+cmake_policy(SET CMP0078 NEW) -+cmake_policy(SET CMP0086 NEW) -+set(UseSWIG_MODULE_VERSION 2) - --MESSAGE(STATUS "Perl: yes") -+find_package(SWIG REQUIRED) -+include(${SWIG_USE_FILE}) -+ -+find_package(PerlLibs REQUIRED) -+include_directories(${PERL_INCLUDE_PATH}) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) -+ -+ -+set_source_files_properties(../sword.i PROPERTIES CPLUSPLUS ON) -+ -+SWIG_ADD_LIBRARY(Sword -+ TYPE SHARED -+ LANGUAGE perl SOURCES ../sword.i -+ ) -+TARGET_LINK_LIBRARIES(Sword ${PERL_LIBRARIES} ${SWORD_LINK_NAME}) -+ -+ -+install( -+ TARGETS Sword -+ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl/auto/Sword" -+) -+get_target_property(SWIG_BUILDIR Sword SWIG_SUPPORT_FILES_DIRECTORY) -+ -+message(STATUS "SWIG_BUILDIR=${SWIG_BUILDIR}") -+install( -+ FILES ${SWIG_BUILDIR}/Sword.pm -+ DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl" -+) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d409129 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +Retired: Fails to install + +See https://pagure.io/releng/issue/11685 diff --git a/sources b/sources deleted file mode 100644 index 8c3a0a0..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f diff --git a/sword.spec b/sword.spec deleted file mode 100644 index 4d8a0cb..0000000 --- a/sword.spec +++ /dev/null @@ -1,520 +0,0 @@ -%define soversion 1.9 -%define pkg_version 1.9.0 - -Name: sword -Epoch: 1 -Version: 1.9.0 -Release: 21%{?dist} -Summary: Free Bible Software Project -License: GPLv2 -URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz -BuildRequires: make -BuildRequires: cmake -BuildRequires: cmake-data -BuildRequires: openssl-devel -BuildRequires: curl-devel -BuildRequires: zlib-devel -BuildRequires: libidn-devel -BuildRequires: libicu-devel icu -BuildRequires: clucene-core-devel -BuildRequires: cppunit-devel -BuildRequires: swig -BuildRequires: python3-devel -BuildRequires: perl-devel -BuildRequires: perl-generators -BuildRequires: gcc -BuildRequires: gcc-c++ - -Patch0: cmake-perl-bindings.diff - -%description -The SWORD Project is the CrossWire Bible Society's free Bible software -project. Its purpose is to create cross-platform open-source tools-- -covered by the GNU General Public License-- that allow programmers and -Bible societies to write new Bible software more quickly and easily. We -also create Bible study software for all readers, students, scholars, -and translators of the Bible, and have a growing collection of over 200 -texts in over 50 languages. - -%package devel -Summary: Development files for the sword project -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: pkgconfig -Requires: curl-devel clucene-core-devel libicu-devel - -%description devel -This package contains the development headers and libraries for the -sword API. You need this package if you plan on compiling software -that uses the sword API, such as Gnomesword or Bibletime. - -%package utils -Summary: Utilities for the sword project -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description utils -This package contains the pre-built utilities for use with the SWORD -Project. The SWORD Project developers encourage you to use the latest -development version of the utilities rather than those released with -a packaged release as updates to the utilities do not affect the -release schedule of the library. However, these utilities were the -latest at the time of the current library release. - -%package -n python3-sword -%{?python_provide:%python_provide python3-sword} -Summary: Python bindings for Sword -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: python3 -%py_provides python3-Sword - -%description -n python3-sword -Python bindings for The SWORD Library. - -%package -n perl-sword -%{?perl_provide:%perl_provide perl-sword} -Summary: Perl bindings for Sword -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: perl-interpreter -Requires: perl-XML-LibXML -Requires: perl-HTML-Strip - -%description -n perl-sword -Perl bindings for The SWORD Library. - -%prep -%setup -q - -%patch -P0 -p1 -b .perl - -%build -%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ - -DSWORD_PYTHON_3:BOOL=TRUE \ - -DSWORD_PERL:BOOL=TRUE \ - -DSWORD_BUILD_UTILS="Yes" \ - -DLIBSWORD_SOVERSION=%{soversion} \ - -DLIBDIR=%{_libdir} \ - -DSWORD_BUILD_TESTS=Yes \ - -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" -%cmake_build - -%install -%cmake_install -mkdir -p %{buildroot}%{_datadir}/sword/modules - -find %{buildroot} -type f -name "*.la" -delete -print - -%check -make tests - -%files -%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README -%doc samples doc -# Re-enable after upstream includes it with CMake builds -%config(noreplace) %{_sysconfdir}/sword.conf -%{_libdir}/libsword.so.%{soversion} -%{_datadir}/sword - -%files devel -%doc CODINGSTYLE -%{_includedir}/sword/ -%{_libdir}/libsword.so -%{_libdir}/pkgconfig/sword.pc - -%files utils -%{_bindir}/vs2osisref -%{_bindir}/vs2osisreftxt -%{_bindir}/mod2vpl -%{_bindir}/imp2ld -%{_bindir}/diatheke -%{_bindir}/mkfastmod -%{_bindir}/mod2zmod -%{_bindir}/xml2gbs -%{_bindir}/imp2vs -%{_bindir}/installmgr -%{_bindir}/osis2mod -%{_bindir}/tei2mod -%{_bindir}/vpl2mod -%{_bindir}/mod2imp -%{_bindir}/addld -%{_bindir}/imp2gbs -%{_bindir}/mod2osis -%{_bindir}/emptyvss - -%files -n python3-sword -%pycached %{python3_sitearch}/Sword.py -%{python3_sitearch}/_Sword%{python3_ext_suffix} -%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info - -%files -n perl-sword -%{perl_vendorarch}/* -%exclude %dir %{perl_vendorarch}/auto/ - - -%changelog -* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 -- Rebuilt for ICU 73.2 - -* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 -- Perl 5.38 rebuild - -* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 -- Replace requirement of meta-package perl by perl-interpreter - -* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 -- Rebuild for ICU 72 - -* Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 -- Add BR perl-generators to automatically generates run-time dependencies - for installed Perl files - -* Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 -- Rebuilt for ICU 71.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1:1.9.0-11 -- Rebuilt for Python 3.11 - -* Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 -- Perl 5.36 rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 -- Correct dependencies for subpackages - -* Fri Jun 04 2021 Python Maint - 1:1.9.0-6 -- Rebuilt for Python 3.10 - -* Mon May 24 2021 Greg Hellings - 1:1.9.0-5 -- Add Epoch tag - -* Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 -- Perl 5.34 rebuild - -* Wed May 19 2021 Pete Walter - 1.9.0-4 -- Rebuild for ICU 69 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Dec 14 2020 Greg Hellings - 1.9.0-2 -- Restore Perl bindings - -* Tue Dec 1 2020 Greg Hellings - 1.9.0-1 -- Upstream 1.9.0 release - -* Fri Oct 2 2020 Greg Hellings - 1.8.903-1 -- Upstream 1.9.0RC3 release - -* Fri Sep 11 2020 Greg Hellings - 1.8.901-1 -- Upstream 1.9.0RC1 release - -* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 -- Perl 5.32 rebuild - -* Tue May 26 2020 Miro Hrončok - 1.8.1-21 -- Rebuilt for Python 3.9 - -* Fri May 15 2020 Pete Walter - 1.8.1-20 -- Rebuild for ICU 67 - -* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 -- Added patch to fix upstream markup bug - -* Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Nov 01 2019 Pete Walter - 1.8.1-17 -- Rebuild for ICU 65 - -* Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 -- Fixed conflicting integer types being defined - -* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 -- Rebuilt for Python 3.8 - -* Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 -- Added Perl bindings - -* Sat Jul 27 2019 Fedora Release Engineering - 1.8.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Jan 23 2019 Pete Walter - 1.8.1-10 -- Rebuild for ICU 63 - -* Mon Sep 24 2018 Greg Hellings - 1.8.1-9 -- Remove Python 2 binding build: BZ1627373 - -* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jul 11 2018 Greg Hellings - 1.8.1-7 -- Add flags for building ICU 61+ -- Patch Python building for Python 2/3 combined - -* Tue Jul 10 2018 Pete Walter - 1.8.1-6 -- Rebuild for ICU 62 - -* Mon Apr 30 2018 Pete Walter - 1.8.1-5 -- Rebuild for ICU 61.1 - -* Wed Feb 21 2018 Iryna Shcherbina - 1.8.1-4 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Sun Feb 18 2018 Gregory Hellings - 1.8.1-3 -- Remove post/postun for F28+ -- Rename python-sword to python2-sword -- Add BR for gcc/g++ per F28+ changes - -* Fri Feb 09 2018 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* 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 Nov 30 2017 Pete Walter - 1.7.4-15 -- Rebuild for ICU 60.1 - -* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-14 -- Add Provides for the old name without %%_isa - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-13 -- Python 2 binary package renamed to python2-sword - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 1.7.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Jul 19 2016 Fedora Release Engineering - 1.7.4-8 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Apr 15 2016 David Tardon - 1.7.4-7 -- rebuild for ICU 57.1 - -* Fri Feb 05 2016 Fedora Release Engineering - 1.7.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 28 2015 David Tardon - 1.7.4-5 -- rebuild for ICU 56.1 - -* Fri Jun 19 2015 Fedora Release Engineering - 1.7.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Kalev Lember - 1.7.4-3 -- Rebuilt for GCC 5 C++11 ABI change - -* Mon Jan 26 2015 David Tardon - 1.7.4-2 -- rebuild for ICU 54.1 - -* Wed Dec 24 2014 Greg Hellings - 1.7.4-1 -- New upstream release -- Removed upstreamed patches - -* Tue Dec 09 2014 Greg Hellings - 1.7.3.900-3 -- Fixed invalid pkg-config - -* Mon Dec 08 2014 Greg Hellings - 1.7.3.900-2 -- Changed to CMake -- Added Python bindings - -* Wed Dec 03 2014 Greg Hellings - 1.7.3.900-1 -- Upstream pre-release version bump - -* Mon Oct 27 2014 Greg Hellings - 1.7.3-9 -- Release bump - -* Tue Aug 26 2014 David Tardon - 1.7.3-7 -- rebuild for ICU 53.1 - -* Mon Aug 18 2014 Fedora Release Engineering - 1.7.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Aug 13 2014 Rex Dieter - 1.7.3-5 -- revert some incompatible "cleanup" (%%make_build undefined on < f21) -- -devel: drop extraneous lib deps (let pkgconfig autoreq handle it as needed) - -* Mon Aug 11 2014 Greg Hellings - 1.7.3-4 -- Change curl-devel for libcurl-devel - -* Sat Aug 02 2014 Christopher Meng - 1.7.3-3 -- devel subpkg cleanup - -* Sun Jun 08 2014 Fedora Release Engineering - 1.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue May 06 2014 Greg Hellings - 1.7.3-1 -- New upstream version - -* Thu Feb 13 2014 Greg Hellings - 1.7.2-2 -- Rebuilt for ICU 52 - -* Wed Jan 29 2014 Deji Akingunola - 1.7.2-1 -- Update to sword-1.7.2 - -* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Feb 01 2013 Parag Nemade - 1.6.2-10 -- Rebuild for icu 50 - -* Sat Jul 21 2012 Fedora Release Engineering - 1.6.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun May 20 2012 Deji Akingunola - 1.6.2-8 -- Rebuild for icu soname change - -* Wed Feb 22 2012 Deji Akingunola - 1.6.2-7 -- Fix compile error with gcc-4.7 - -* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Oct 2 2011 Tom Callaway - 1.6.2-5 -- fix compile against clucene2 - -* Fri Sep 09 2011 Caolán McNamara - 1.6.2-4 -- rebuild for icu 4.8.1 - -* Mon Mar 07 2011 Caolán McNamara - 1.6.2-3 -- rebuild for icu 4.6 - -* Wed Feb 09 2011 Fedora Release Engineering - 1.6.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Oct 22 2010 Deji Akingunola - 1.6.2-1 -- Update to version 1.6.2 - -* Fri Apr 02 2010 Caolán McNamara - 1.6.1-3 -- rebuild for icu 4.4 - -* Sat Mar 20 2010 Deji Akingunola - 1.6.1-2 -- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 - -* Wed Jan 13 2010 Deji Akingunola - 1.6.1-1 -- Update to version 1.6.1 - -* Sun Jul 26 2009 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu May 14 2009 Deji Akingunola - 1.6.0-1 -- Update to version 1.6.0 - -* Wed Feb 25 2009 Fedora Release Engineering - 1.5.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Deji Akingunola - 1.5.11-3 -- Add patch to build with gcc-4.4 - -* Tue Jun 03 2008 Caolán McNamara - 1.5.11-2 -- rebuild for new icu - -* Mon May 26 2008 Deji Akingunola - 1.5.11-1 -- Update to version 1.5.11 - -* Thu Feb 21 2008 Deji Akingunola - 1.5.10-3 -- Fix command injection bug (Bug #433723) - -* Thu Jan 10 2008 Deji Akingunola - 1.5.10-2 -- Fix build issue with gcc43 - -* Mon Nov 05 2007 Deji Akingunola - 1.5.10-1 -- Update to version 1.5.10 - -* Tue Sep 25 2007 Deji Akingunola - 1.5.9-7 -- Fix the build failure due to glibc open() check - -* Sat Aug 25 2007 Deji Akingunola - 1.5.9-6 -- Rebuild - -* Fri Aug 03 2007 Deji Akingunola - 1.5.9-5 -- License tag update -- Rebuild for new icu - -* Sat Jan 20 2007 Deji Akingunola - 1.5.9-4 -- Fix an error (libicu-devel not icu-devel) - -* Sat Jan 20 2007 Deji Akingunola - 1.5.9-3 -- Add Requires for the -devel subpackage - -* Sun Jan 14 2007 Deji Akingunola - 1.5.9-2 -- Rebuild with lucene support - -* Wed Nov 08 2006 Deji Akingunola - 1.5.9-1 -- New release -- Build with icu support - -* Wed Sep 20 2006 Deji Akingunola - 1.5.8-9 -- Take over from Michael A. Peters -- Rebuild for FC6 - -* Sat Jun 03 2006 Michael A. Peters - 1.5.8-8 -- Added pkgconfig to devel package Requires - -* Fri Feb 17 2006 Michael A. Peters - 1.5.8-7 -- Rebuild in devel branch - -* Wed Dec 14 2005 Michael A. Peters - 1.5.8-6 -- rebuild in devel branch with new compiler suite -- remove specific release from devel requires of main package -- do not build with %%{_smp_mflags} - -* Mon Nov 21 2005 Michael A. Peters - 1.5.8-5 -- disable static library - -* Sun Nov 13 2005 Michael A. Peters - 1.5.8-4.1 -- Rebuild against new openssl - -* Sat Oct 29 2005 Michael A. Peters - 1.5.8-4 -- Added Arabic support files from Developer mailing list (they have -- been added to the upstream SVN version) - -* Thu Jun 09 2005 Michael A. Peters - 1.5.8-3 -- fix line breaks - -* Mon Jun 06 2005 Michael A. Peters - 1.5.8-1 -- initial CVS checkin for Fedora Extras diff --git a/tests/installmgr.sh b/tests/installmgr.sh deleted file mode 100755 index daf9ac4..0000000 --- a/tests/installmgr.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -ex - -OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" -yes | installmgr $OPTS -init -installmgr $OPTS -sc -installmgr $OPTS -r CrossWire diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d8f9dc2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - tests: - - installmgr: - dir: . - run: installmgr.sh From 4dc4afda3cc9816584fa3c1b073e65f7909e2496 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Thu, 5 Oct 2023 10:29:23 +0200 Subject: [PATCH 07/27] Unretirement request: https://pagure.io/releng/issue/11700 --- .gitignore | 13 + cmake-perl-bindings.diff | 105 ++++++++ dead.package | 3 - sources | 1 + sword.spec | 520 +++++++++++++++++++++++++++++++++++++++ tests/installmgr.sh | 7 + tests/tests.yml | 10 + 7 files changed, 656 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 cmake-perl-bindings.diff delete mode 100644 dead.package create mode 100644 sources create mode 100644 sword.spec create mode 100755 tests/installmgr.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..eb752e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*.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 +/sword-1.9.0RC1.tar.gz +/sword-1.9.0RC3.tar.gz +/sword-1.9.0.tar.gz diff --git a/cmake-perl-bindings.diff b/cmake-perl-bindings.diff new file mode 100644 index 0000000..ea6710a --- /dev/null +++ b/cmake-perl-bindings.diff @@ -0,0 +1,105 @@ +diff -bru a/bindings/swig/perl/CMakeLists.txt b/bindings/swig/perl/CMakeLists.txt +--- a/bindings/swig/perl/CMakeLists.txt 2020-07-29 18:59:48.000000000 +0200 ++++ b/bindings/swig/perl/CMakeLists.txt 2020-11-01 19:56:20.825016280 +0100 +@@ -1,68 +1,35 @@ +-# This method works but there is no good way to install the results of it +-#FIND_PACKAGE(PerlLibs REQUIRED) +-#INCLUDE_DIRECTORIES(${PERL_INCLUDE_PATH}) +-# +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES CPLUSPLUS ON) +-#SET_SOURCE_FILES_PROPERTIES(../sword.i PROPERTIES SWIG_FLAGS "") +-# +-#SWIG_ADD_MODULE(Sword perl +-# "../sword.i" +-#) +-# +-#SWIG_LINK_LIBRARIES(Sword ${PERL_LIBRARY} ${SWORD_LINK_NAME}) +- +-FIND_PACKAGE(Perl REQUIRED) +- +-SET(PERL_MAKEFILE "#!${PERL_EXECUTABLE} +- +-use ExtUtils::MakeMaker; +- +-# See lib/ExtUtils/MakeMaker.pm for details of how to influence +-# the contents of the Makefile that is written +-WriteMakefile( +- 'NAME' => 'Sword', +- 'VERSION' => '${SWORD_VERSION}', +- 'INC' => '-I\"${CMAKE_SOURCE_DIR}/include\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/..\"', +- 'DEFINE' => '-DSWIG', +- 'LIBS' => '-L\"${CMAKE_BINARY_DIR}\" -lsword -lz', +- 'FIRST_MAKEFILE' => 'Makefile.perlswig', +- 'PREREQ_PM' => {}, +- ($] >= 5.005 ? ## Add these new keywords supported since 5.005 +- (ABSTRACT => 'Sword Project perl bindings', # retrieve abstract from module +- AUTHOR => 'Sword Project ') : ()), +-); +- +-rename 'Makefile.perlswig', 'Makefile.perlswig.old' or die \"Can't rename Makefile\"; +-open(INPUT, 'Makefile.perlswig') or die \"Can't open output Makefile\"; +-while () { +- s/\\-lsword/\\-lsword \\-lstdc\\+\\+/; +- print OUTPUT \"$_\"; +-} +- +-close INPUT; +-close OUTPUT;") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.PL "${PERL_MAKEFILE}") +- +-SET(SKIP_MAKEFILE "\\.old +-~$ +-\\.bak +-^CVS +-Makefile$") +-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Makefile.SKIP "${SKIP_MAKEFILE}") +- +-SWORD_SWIG_GENERATE(perl) +- +-ADD_CUSTOM_COMMAND(OUTPUT MANIFEST Makefile.perlswig +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig clean +- COMMAND ${PERL_EXECUTABLE} Makefile.PL && make -f Makefile.perlswig manifest +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +- +-ADD_CUSTOM_TARGET(perlswig ALL +- COMMAND make -f Makefile.perlswig +- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Sword.cxx ${CMAKE_CURRENT_BINARY_DIR}/Makefile.perlswig ${SWORD_LINK_NAME} +- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) ++# Perl Swig bindings + +-INSTALL(SCRIPT install.cmake) ++cmake_minimum_required(VERSION 3.14.7) ++cmake_policy(SET CMP0078 NEW) ++cmake_policy(SET CMP0086 NEW) ++set(UseSWIG_MODULE_VERSION 2) + +-MESSAGE(STATUS "Perl: yes") ++find_package(SWIG REQUIRED) ++include(${SWIG_USE_FILE}) ++ ++find_package(PerlLibs REQUIRED) ++include_directories(${PERL_INCLUDE_PATH}) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) ++ ++ ++set_source_files_properties(../sword.i PROPERTIES CPLUSPLUS ON) ++ ++SWIG_ADD_LIBRARY(Sword ++ TYPE SHARED ++ LANGUAGE perl SOURCES ../sword.i ++ ) ++TARGET_LINK_LIBRARIES(Sword ${PERL_LIBRARIES} ${SWORD_LINK_NAME}) ++ ++ ++install( ++ TARGETS Sword ++ LIBRARY DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl/auto/Sword" ++) ++get_target_property(SWIG_BUILDIR Sword SWIG_SUPPORT_FILES_DIRECTORY) ++ ++message(STATUS "SWIG_BUILDIR=${SWIG_BUILDIR}") ++install( ++ FILES ${SWIG_BUILDIR}/Sword.pm ++ DESTINATION "${LIB_INSTALL_DIR}/perl5/vendor_perl" ++) diff --git a/dead.package b/dead.package deleted file mode 100644 index d409129..0000000 --- a/dead.package +++ /dev/null @@ -1,3 +0,0 @@ -Retired: Fails to install - -See https://pagure.io/releng/issue/11685 diff --git a/sources b/sources new file mode 100644 index 0000000..8c3a0a0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f diff --git a/sword.spec b/sword.spec new file mode 100644 index 0000000..4d8a0cb --- /dev/null +++ b/sword.spec @@ -0,0 +1,520 @@ +%define soversion 1.9 +%define pkg_version 1.9.0 + +Name: sword +Epoch: 1 +Version: 1.9.0 +Release: 21%{?dist} +Summary: Free Bible Software Project +License: GPLv2 +URL: http://www.crosswire.org/sword/ +Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz +BuildRequires: make +BuildRequires: cmake +BuildRequires: cmake-data +BuildRequires: openssl-devel +BuildRequires: curl-devel +BuildRequires: zlib-devel +BuildRequires: libidn-devel +BuildRequires: libicu-devel icu +BuildRequires: clucene-core-devel +BuildRequires: cppunit-devel +BuildRequires: swig +BuildRequires: python3-devel +BuildRequires: perl-devel +BuildRequires: perl-generators +BuildRequires: gcc +BuildRequires: gcc-c++ + +Patch0: cmake-perl-bindings.diff + +%description +The SWORD Project is the CrossWire Bible Society's free Bible software +project. Its purpose is to create cross-platform open-source tools-- +covered by the GNU General Public License-- that allow programmers and +Bible societies to write new Bible software more quickly and easily. We +also create Bible study software for all readers, students, scholars, +and translators of the Bible, and have a growing collection of over 200 +texts in over 50 languages. + +%package devel +Summary: Development files for the sword project +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: pkgconfig +Requires: curl-devel clucene-core-devel libicu-devel + +%description devel +This package contains the development headers and libraries for the +sword API. You need this package if you plan on compiling software +that uses the sword API, such as Gnomesword or Bibletime. + +%package utils +Summary: Utilities for the sword project +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} + +%description utils +This package contains the pre-built utilities for use with the SWORD +Project. The SWORD Project developers encourage you to use the latest +development version of the utilities rather than those released with +a packaged release as updates to the utilities do not affect the +release schedule of the library. However, these utilities were the +latest at the time of the current library release. + +%package -n python3-sword +%{?python_provide:%python_provide python3-sword} +Summary: Python bindings for Sword +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: python3 +%py_provides python3-Sword + +%description -n python3-sword +Python bindings for The SWORD Library. + +%package -n perl-sword +%{?perl_provide:%perl_provide perl-sword} +Summary: Perl bindings for Sword +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Requires: perl-interpreter +Requires: perl-XML-LibXML +Requires: perl-HTML-Strip + +%description -n perl-sword +Perl bindings for The SWORD Library. + +%prep +%setup -q + +%patch -P0 -p1 -b .perl + +%build +%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ + -DSWORD_PYTHON_3:BOOL=TRUE \ + -DSWORD_PERL:BOOL=TRUE \ + -DSWORD_BUILD_UTILS="Yes" \ + -DLIBSWORD_SOVERSION=%{soversion} \ + -DLIBDIR=%{_libdir} \ + -DSWORD_BUILD_TESTS=Yes \ + -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" +%cmake_build + +%install +%cmake_install +mkdir -p %{buildroot}%{_datadir}/sword/modules + +find %{buildroot} -type f -name "*.la" -delete -print + +%check +make tests + +%files +%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README +%doc samples doc +# Re-enable after upstream includes it with CMake builds +%config(noreplace) %{_sysconfdir}/sword.conf +%{_libdir}/libsword.so.%{soversion} +%{_datadir}/sword + +%files devel +%doc CODINGSTYLE +%{_includedir}/sword/ +%{_libdir}/libsword.so +%{_libdir}/pkgconfig/sword.pc + +%files utils +%{_bindir}/vs2osisref +%{_bindir}/vs2osisreftxt +%{_bindir}/mod2vpl +%{_bindir}/imp2ld +%{_bindir}/diatheke +%{_bindir}/mkfastmod +%{_bindir}/mod2zmod +%{_bindir}/xml2gbs +%{_bindir}/imp2vs +%{_bindir}/installmgr +%{_bindir}/osis2mod +%{_bindir}/tei2mod +%{_bindir}/vpl2mod +%{_bindir}/mod2imp +%{_bindir}/addld +%{_bindir}/imp2gbs +%{_bindir}/mod2osis +%{_bindir}/emptyvss + +%files -n python3-sword +%pycached %{python3_sitearch}/Sword.py +%{python3_sitearch}/_Sword%{python3_ext_suffix} +%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info + +%files -n perl-sword +%{perl_vendorarch}/* +%exclude %dir %{perl_vendorarch}/auto/ + + +%changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 František Zatloukal - 1:1.9.0-20 +- Rebuilt for ICU 73.2 + +* Tue Jul 11 2023 Jitka Plesnikova - 1:1.9.0-19 +- Perl 5.38 rebuild + +* Fri Jun 30 2023 Jitka Plesnikova - 1:1.9.0-18 +- Replace requirement of meta-package perl by perl-interpreter + +* Tue Jun 13 2023 Python Maint - 1:1.9.0-17 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 1:1.9.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Dec 31 2022 Pete Walter - 1:1.9.0-15 +- Rebuild for ICU 72 + +* Mon Dec 12 2022 Jitka Plesnikova - 1:1.9.0-14 +- Add BR perl-generators to automatically generates run-time dependencies + for installed Perl files + +* Mon Aug 01 2022 Frantisek Zatloukal - 1:1.9.0-13 +- Rebuilt for ICU 71.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 1:1.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1:1.9.0-11 +- Rebuilt for Python 3.11 + +* Mon May 30 2022 Jitka Plesnikova - 1:1.9.0-10 +- Perl 5.36 rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1:1.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1:1.9.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 09 2021 Greg Hellings - 1:1.9.0-7 +- Correct dependencies for subpackages + +* Fri Jun 04 2021 Python Maint - 1:1.9.0-6 +- Rebuilt for Python 3.10 + +* Mon May 24 2021 Greg Hellings - 1:1.9.0-5 +- Add Epoch tag + +* Fri May 21 2021 Jitka Plesnikova - 1.9.0-5 +- Perl 5.34 rebuild + +* Wed May 19 2021 Pete Walter - 1.9.0-4 +- Rebuild for ICU 69 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Dec 14 2020 Greg Hellings - 1.9.0-2 +- Restore Perl bindings + +* Tue Dec 1 2020 Greg Hellings - 1.9.0-1 +- Upstream 1.9.0 release + +* Fri Oct 2 2020 Greg Hellings - 1.8.903-1 +- Upstream 1.9.0RC3 release + +* Fri Sep 11 2020 Greg Hellings - 1.8.901-1 +- Upstream 1.9.0RC1 release + +* Sat Aug 01 2020 Fedora Release Engineering - 1.8.1-24 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jun 22 2020 Jitka Plesnikova - 1.8.1-22 +- Perl 5.32 rebuild + +* Tue May 26 2020 Miro Hrončok - 1.8.1-21 +- Rebuilt for Python 3.9 + +* Fri May 15 2020 Pete Walter - 1.8.1-20 +- Rebuild for ICU 67 + +* Sun Apr 26 2020 Greg Hellings - 1.8.1-19 +- Added patch to fix upstream markup bug + +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Nov 01 2019 Pete Walter - 1.8.1-17 +- Rebuild for ICU 65 + +* Thu Oct 03 2019 Miro Hrončok - 1.8.1-16 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Jaak Ristioja - 1.8.1-15 +- Fixed conflicting integer types being defined + +* Mon Aug 19 2019 Miro Hrončok - 1.8.1-14 +- Rebuilt for Python 3.8 + +* Sun Aug 04 2019 Dominique Corbex - 1.8.1-13 +- Added Perl bindings + +* Sat Jul 27 2019 Fedora Release Engineering - 1.8.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.8.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 23 2019 Pete Walter - 1.8.1-10 +- Rebuild for ICU 63 + +* Mon Sep 24 2018 Greg Hellings - 1.8.1-9 +- Remove Python 2 binding build: BZ1627373 + +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jul 11 2018 Greg Hellings - 1.8.1-7 +- Add flags for building ICU 61+ +- Patch Python building for Python 2/3 combined + +* Tue Jul 10 2018 Pete Walter - 1.8.1-6 +- Rebuild for ICU 62 + +* Mon Apr 30 2018 Pete Walter - 1.8.1-5 +- Rebuild for ICU 61.1 + +* Wed Feb 21 2018 Iryna Shcherbina - 1.8.1-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Sun Feb 18 2018 Gregory Hellings - 1.8.1-3 +- Remove post/postun for F28+ +- Rename python-sword to python2-sword +- Add BR for gcc/g++ per F28+ changes + +* Fri Feb 09 2018 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* 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 Nov 30 2017 Pete Walter - 1.7.4-15 +- Rebuild for ICU 60.1 + +* Sun Aug 20 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-14 +- Add Provides for the old name without %%_isa + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.7.4-13 +- Python 2 binary package renamed to python2-sword + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.7.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 1.7.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.7.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 1.7.4-8 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Apr 15 2016 David Tardon - 1.7.4-7 +- rebuild for ICU 57.1 + +* Fri Feb 05 2016 Fedora Release Engineering - 1.7.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 28 2015 David Tardon - 1.7.4-5 +- rebuild for ICU 56.1 + +* Fri Jun 19 2015 Fedora Release Engineering - 1.7.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.7.4-3 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Jan 26 2015 David Tardon - 1.7.4-2 +- rebuild for ICU 54.1 + +* Wed Dec 24 2014 Greg Hellings - 1.7.4-1 +- New upstream release +- Removed upstreamed patches + +* Tue Dec 09 2014 Greg Hellings - 1.7.3.900-3 +- Fixed invalid pkg-config + +* Mon Dec 08 2014 Greg Hellings - 1.7.3.900-2 +- Changed to CMake +- Added Python bindings + +* Wed Dec 03 2014 Greg Hellings - 1.7.3.900-1 +- Upstream pre-release version bump + +* Mon Oct 27 2014 Greg Hellings - 1.7.3-9 +- Release bump + +* Tue Aug 26 2014 David Tardon - 1.7.3-7 +- rebuild for ICU 53.1 + +* Mon Aug 18 2014 Fedora Release Engineering - 1.7.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Wed Aug 13 2014 Rex Dieter - 1.7.3-5 +- revert some incompatible "cleanup" (%%make_build undefined on < f21) +- -devel: drop extraneous lib deps (let pkgconfig autoreq handle it as needed) + +* Mon Aug 11 2014 Greg Hellings - 1.7.3-4 +- Change curl-devel for libcurl-devel + +* Sat Aug 02 2014 Christopher Meng - 1.7.3-3 +- devel subpkg cleanup + +* Sun Jun 08 2014 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue May 06 2014 Greg Hellings - 1.7.3-1 +- New upstream version + +* Thu Feb 13 2014 Greg Hellings - 1.7.2-2 +- Rebuilt for ICU 52 + +* Wed Jan 29 2014 Deji Akingunola - 1.7.2-1 +- Update to sword-1.7.2 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.6.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Feb 01 2013 Parag Nemade - 1.6.2-10 +- Rebuild for icu 50 + +* Sat Jul 21 2012 Fedora Release Engineering - 1.6.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun May 20 2012 Deji Akingunola - 1.6.2-8 +- Rebuild for icu soname change + +* Wed Feb 22 2012 Deji Akingunola - 1.6.2-7 +- Fix compile error with gcc-4.7 + +* Sat Jan 14 2012 Fedora Release Engineering - 1.6.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Oct 2 2011 Tom Callaway - 1.6.2-5 +- fix compile against clucene2 + +* Fri Sep 09 2011 Caolán McNamara - 1.6.2-4 +- rebuild for icu 4.8.1 + +* Mon Mar 07 2011 Caolán McNamara - 1.6.2-3 +- rebuild for icu 4.6 + +* Wed Feb 09 2011 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Oct 22 2010 Deji Akingunola - 1.6.2-1 +- Update to version 1.6.2 + +* Fri Apr 02 2010 Caolán McNamara - 1.6.1-3 +- rebuild for icu 4.4 + +* Sat Mar 20 2010 Deji Akingunola - 1.6.1-2 +- Work around regression in curl-7.20.0 (Patch by Karl Kleinpaste), fix #569685 + +* Wed Jan 13 2010 Deji Akingunola - 1.6.1-1 +- Update to version 1.6.1 + +* Sun Jul 26 2009 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu May 14 2009 Deji Akingunola - 1.6.0-1 +- Update to version 1.6.0 + +* Wed Feb 25 2009 Fedora Release Engineering - 1.5.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 04 2009 Deji Akingunola - 1.5.11-3 +- Add patch to build with gcc-4.4 + +* Tue Jun 03 2008 Caolán McNamara - 1.5.11-2 +- rebuild for new icu + +* Mon May 26 2008 Deji Akingunola - 1.5.11-1 +- Update to version 1.5.11 + +* Thu Feb 21 2008 Deji Akingunola - 1.5.10-3 +- Fix command injection bug (Bug #433723) + +* Thu Jan 10 2008 Deji Akingunola - 1.5.10-2 +- Fix build issue with gcc43 + +* Mon Nov 05 2007 Deji Akingunola - 1.5.10-1 +- Update to version 1.5.10 + +* Tue Sep 25 2007 Deji Akingunola - 1.5.9-7 +- Fix the build failure due to glibc open() check + +* Sat Aug 25 2007 Deji Akingunola - 1.5.9-6 +- Rebuild + +* Fri Aug 03 2007 Deji Akingunola - 1.5.9-5 +- License tag update +- Rebuild for new icu + +* Sat Jan 20 2007 Deji Akingunola - 1.5.9-4 +- Fix an error (libicu-devel not icu-devel) + +* Sat Jan 20 2007 Deji Akingunola - 1.5.9-3 +- Add Requires for the -devel subpackage + +* Sun Jan 14 2007 Deji Akingunola - 1.5.9-2 +- Rebuild with lucene support + +* Wed Nov 08 2006 Deji Akingunola - 1.5.9-1 +- New release +- Build with icu support + +* Wed Sep 20 2006 Deji Akingunola - 1.5.8-9 +- Take over from Michael A. Peters +- Rebuild for FC6 + +* Sat Jun 03 2006 Michael A. Peters - 1.5.8-8 +- Added pkgconfig to devel package Requires + +* Fri Feb 17 2006 Michael A. Peters - 1.5.8-7 +- Rebuild in devel branch + +* Wed Dec 14 2005 Michael A. Peters - 1.5.8-6 +- rebuild in devel branch with new compiler suite +- remove specific release from devel requires of main package +- do not build with %%{_smp_mflags} + +* Mon Nov 21 2005 Michael A. Peters - 1.5.8-5 +- disable static library + +* Sun Nov 13 2005 Michael A. Peters - 1.5.8-4.1 +- Rebuild against new openssl + +* Sat Oct 29 2005 Michael A. Peters - 1.5.8-4 +- Added Arabic support files from Developer mailing list (they have +- been added to the upstream SVN version) + +* Thu Jun 09 2005 Michael A. Peters - 1.5.8-3 +- fix line breaks + +* Mon Jun 06 2005 Michael A. Peters - 1.5.8-1 +- initial CVS checkin for Fedora Extras diff --git a/tests/installmgr.sh b/tests/installmgr.sh new file mode 100755 index 0000000..daf9ac4 --- /dev/null +++ b/tests/installmgr.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -ex + +OPTS="--allow-internet-access-and-risk-tracing-and-jail-or-martyrdom" +yes | installmgr $OPTS -init +installmgr $OPTS -sc +installmgr $OPTS -r CrossWire diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..d8f9dc2 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,10 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + - container + tests: + - installmgr: + dir: . + run: installmgr.sh From 7b1439e7bc52bad6ddbcdfb092c023df9d184798 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 5 Oct 2023 14:22:52 -0600 Subject: [PATCH 08/27] Revamp packaging, fix Python bindings build failure (fedora#2241414) --- LICENSE_README | 3 ++ migrate-to-setuptools.diff | 82 ++++++++++++++++++++++++++++++++++++++ sources | 2 +- sword.spec | 60 +++++++++++++++++----------- sword_gen_free_tarball.sh | 30 ++++++++++++++ 5 files changed, 153 insertions(+), 24 deletions(-) create mode 100644 LICENSE_README create mode 100644 migrate-to-setuptools.diff create mode 100755 sword_gen_free_tarball.sh diff --git a/LICENSE_README b/LICENSE_README new file mode 100644 index 0000000..e32f5ab --- /dev/null +++ b/LICENSE_README @@ -0,0 +1,3 @@ +Files under the CMake directory originate from code licensed under the BSD-3-Clause license, the Boost Software License or (possibly) the BSD-2-Clause license. Modifications to these files made by the SWORD developers are licensed under GPLv2, effectively mixing code of two different licenses into the same file. + +The files sword-1.9.0/include/ftpparse.h and sword-1.9.0/src/utilfuns/ftpparse.c contain an informal non-free license, however their author (D. J. Bernstein) has placed them into the public domain and alternately allowed them to be used under any one of several FOSS licenses. (See https://cr.yp.to/distributors.html, section "What are the distribution terms for ftpparse?") The versions of these files in SWORD aren't *quite* identical to the originals (they appear to have been modified to work properly and safely in SWORD), but they're very nearly identical. The License field of the package contains the three Fedora-allowable licenses given. diff --git a/migrate-to-setuptools.diff b/migrate-to-setuptools.diff new file mode 100644 index 0000000..2805fd4 --- /dev/null +++ b/migrate-to-setuptools.diff @@ -0,0 +1,82 @@ +From 07b31a74ea920077fa0d69cdab2ab188dd17b322 Mon Sep 17 00:00:00 2001 +From: Aaron Rainbolt +Date: Wed, 27 Sep 2023 10:51:27 -0600 +Subject: [PATCH] Migrate to setuptools + +--- + bindings/swig/oldmake/Makefile.am | 2 +- + bindings/swig/package/Makefile.am | 3 +-- + bindings/swig/package/Makefile.in | 3 +-- + bindings/swig/python/CMakeLists.txt | 7 +++++-- + 4 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/bindings/swig/oldmake/Makefile.am b/bindings/swig/oldmake/Makefile.am +index 45a37ef..789813b 100644 +--- a/bindings/swig/oldmake/Makefile.am ++++ b/bindings/swig/oldmake/Makefile.am +@@ -76,7 +76,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup, Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "setup (name = \"sword\"," >> python/setup.py + @echo " version = \"$(VERSION)\"," >> python/setup.py + @echo " maintainer = \"Sword Developers\"," >> python/setup.py +diff --git a/bindings/swig/package/Makefile.am b/bindings/swig/package/Makefile.am +index 14500c3..f44974d 100644 +--- a/bindings/swig/package/Makefile.am ++++ b/bindings/swig/package/Makefile.am +@@ -84,8 +84,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup" >> python/setup.py +- @echo "from distutils.extension import Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py +diff --git a/bindings/swig/package/Makefile.in b/bindings/swig/package/Makefile.in +index b5f05c9..370a9e7 100644 +--- a/bindings/swig/package/Makefile.in ++++ b/bindings/swig/package/Makefile.in +@@ -938,8 +938,7 @@ python_makebuild: $(PYTHONSWIG) + echo "writing python/setup.py" + @echo "#! /usr/bin/python" > python/setup.py + @echo "" >> python/setup.py +- @echo "from distutils.core import setup" >> python/setup.py +- @echo "from distutils.extension import Extension" >> python/setup.py ++ @echo "from setuptools import setup, Extension" >> python/setup.py + @echo "import commands" >> python/setup.py + @echo "" >> python/setup.py + @echo "def pkgconfig(*packages, **kw):" >> python/setup.py +diff --git a/bindings/swig/python/CMakeLists.txt b/bindings/swig/python/CMakeLists.txt +index cbb4058..247bc79 100644 +--- a/bindings/swig/python/CMakeLists.txt ++++ b/bindings/swig/python/CMakeLists.txt +@@ -25,7 +25,7 @@ ENDIF(NOT PYTHONLIBS_FOUND) + + SET(PY_SCRIPT "#!${PYTHON_EXECUTABLE} + +-from distutils.core import setup, Extension ++from setuptools import setup, Extension + setup( + name='sword', + version='${SWORD_VERSION}', +@@ -51,8 +51,11 @@ ADD_CUSTOM_TARGET(swordswig_python${SWORD_PYTHON_VERSION} ALL + WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + + # Allow user installation to custom directory ++IF(NOT SWORD_PYTHON_INSTALL_ROOT STREQUAL "") ++ SET(SETUP_ARGS "\"--root=${SWORD_PYTHON_INSTALL_ROOT}\"") ++ENDIF(NOT SWORD_PYTHON_INSTALL_ROOT STREQUAL "") + IF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") +- SET(SETUP_ARGS "\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"") ++ SET(SETUP_ARGS "${SETUP_ARGS}\"--prefix=${SWORD_PYTHON_INSTALL_DIR}\"") + ENDIF(NOT SWORD_PYTHON_INSTALL_DIR STREQUAL "") + CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install.cmake") +-- +2.41.0 + diff --git a/sources b/sources index 8c3a0a0..a93ac03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sword-1.9.0.tar.gz) = 9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f +SHA512 (sword-1.9.0.tar.gz) = b5a4e30bf088d4b8187fc3addb58a4b6d8ce011f25cecdd4e547f710fa9ffed49c69f36a21ea1c15d1a21205bca09b2fd7c04d6ed176a5c81900a784b9b76d92 diff --git a/sword.spec b/sword.spec index 4d8a0cb..238d952 100644 --- a/sword.spec +++ b/sword.spec @@ -1,33 +1,39 @@ -%define soversion 1.9 -%define pkg_version 1.9.0 +%global soversion 1.9 Name: sword Epoch: 1 Version: 1.9.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Free Bible Software Project -License: GPLv2 +License: GPLv2 AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ -Source0: http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-%{version}.tar.gz +# Source0 tarball is generated by sword_gen_free_tarball.sh, which documents +# repack rationale and automates tarball fetching and repacking +Source0: sword-1.9.0.tar.gz +Source1: sword_gen_free_tarball.sh +Source2: LICENSE_README +# Patch0 was created by a SWORD developer, not applied upstream +Patch0: cmake-perl-bindings.diff +# Patch1 emailed to upstream +Patch1: migrate-to-setuptools.diff BuildRequires: make BuildRequires: cmake -BuildRequires: cmake-data BuildRequires: openssl-devel BuildRequires: curl-devel BuildRequires: zlib-devel BuildRequires: libidn-devel -BuildRequires: libicu-devel icu +BuildRequires: libicu-devel +BuildRequires: icu BuildRequires: clucene-core-devel BuildRequires: cppunit-devel BuildRequires: swig BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: gcc BuildRequires: gcc-c++ -Patch0: cmake-perl-bindings.diff - %description The SWORD Project is the CrossWire Bible Society's free Bible software project. Its purpose is to create cross-platform open-source tools-- @@ -41,7 +47,9 @@ texts in over 50 languages. Summary: Development files for the sword project Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: pkgconfig -Requires: curl-devel clucene-core-devel libicu-devel +Requires: curl-devel +Requires: clucene-core-devel +Requires: libicu-devel %description devel This package contains the development headers and libraries for the @@ -61,17 +69,15 @@ release schedule of the library. However, these utilities were the latest at the time of the current library release. %package -n python3-sword -%{?python_provide:%python_provide python3-sword} +%py_provides python3-sword Summary: Python bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: python3 -%py_provides python3-Sword %description -n python3-sword Python bindings for The SWORD Library. %package -n perl-sword -%{?perl_provide:%perl_provide perl-sword} Summary: Perl bindings for Sword Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: perl-interpreter @@ -82,9 +88,7 @@ Requires: perl-HTML-Strip Perl bindings for The SWORD Library. %prep -%setup -q - -%patch -P0 -p1 -b .perl +%autosetup -p1 %build %cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ @@ -94,25 +98,26 @@ Perl bindings for The SWORD Library. -DLIBSWORD_SOVERSION=%{soversion} \ -DLIBDIR=%{_libdir} \ -DSWORD_BUILD_TESTS=Yes \ - -DSWORD_PYTHON_INSTALL_DIR="%{buildroot}%{_prefix}" + -DSWORD_PYTHON_INSTALL_ROOT="%{buildroot}" \ + -DSWORD_PYTHON_INSTALL_DIR="%{_prefix}" %cmake_build %install %cmake_install mkdir -p %{buildroot}%{_datadir}/sword/modules -find %{buildroot} -type f -name "*.la" -delete -print - %check make tests %files -%doc AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README -%doc samples doc +%doc AUTHORS ChangeLog NEWS README +%doc samples/ +%doc doc/ +%license COPYING LICENSE # Re-enable after upstream includes it with CMake builds %config(noreplace) %{_sysconfdir}/sword.conf %{_libdir}/libsword.so.%{soversion} -%{_datadir}/sword +%{_datadir}/sword/ %files devel %doc CODINGSTYLE @@ -143,7 +148,7 @@ make tests %files -n python3-sword %pycached %{python3_sitearch}/Sword.py %{python3_sitearch}/_Sword%{python3_ext_suffix} -%{python3_sitearch}/sword-%{pkg_version}-py%{python3_version}.egg-info +%{python3_sitearch}/sword-%{version}-py%{python3_version}.egg-info/ %files -n perl-sword %{perl_vendorarch}/* @@ -151,6 +156,15 @@ make tests %changelog +* Fri Sep 29 2023 Aaron Rainbolt - 1:1.9.0-22 +- Replace distutils with setuptools in python setup scripts (rhbz#2220606) +- Don't install the INSTALL file as part of the documentation +- Remove Android bindings as they contain a prebuild binary +- Remove gSOAP bindings as they contain a non-free source file +- Remove Objective C bindings as they contain a non-free source file +- Remove win32-related utility code as it is non-free +- Remove some sort of pre-built PalmOS application binary + * Sat Jul 22 2023 Fedora Release Engineering - 1:1.9.0-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sword_gen_free_tarball.sh b/sword_gen_free_tarball.sh new file mode 100755 index 0000000..9847da4 --- /dev/null +++ b/sword_gen_free_tarball.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +# SWORD's gSOAP bindings contain a file at bindings/gsoap/include/stdsoap.h +# that is labeled "All rights reserved." We therefore have to repack the +# tarball to eliminate this file. Doing so most likely ruins the gSOAP +# bindings, so we just remove the gSOAP bindings altogether. +# +# The Objective C bindings have the same problem as the gSOAP bindings. +# +# There's some win32-related code that has a similar problem too. +# +# Also some sort of PalmOS application binary needs removed. +# +# We also remove the Android bindings since they contain a prebuilt .jar file. +# This could be handled in %prep but it's just as easy and probably a bit +# faster to do it here. + +set -e + +wget http://www.crosswire.org/ftpmirror/pub/sword/source/v1.9/sword-1.9.0.tar.gz +test "$(sha512sum sword-1.9.0.tar.gz | cut -d' ' -f1)" = "9ed3fbb5024af1f93b1473bae0d95534d02a5b00b3c9d41a0f855cee8106dc4e330844080adbee7c3f74c0e5ce1480bf16c87c842421337a341f641bae11137f" +tar -xf sword-1.9.0.tar.gz +rm sword-1.9.0.tar.gz +rm -r sword-1.9.0/bindings/gsoap +rm -r sword-1.9.0/bindings/Android +rm -r sword-1.9.0/bindings/objc +rm -r sword-1.9.0/src/utilfuns/win32 +rm sword-1.9.0/utilities/diatheke/pqa/Diatheke.pqa +tar -czf sword-1.9.0.tar.gz sword-1.9.0 +rm -r sword-1.9.0 From b014cd4adb69d09b9f55c96940e43e845369d81e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sat, 7 Oct 2023 07:04:41 +0000 Subject: [PATCH 09/27] Correct SPDX license formula GPLv2 is not the correct SPDX id. --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 238d952..bd05b64 100644 --- a/sword.spec +++ b/sword.spec @@ -5,7 +5,7 @@ Epoch: 1 Version: 1.9.0 Release: 22%{?dist} Summary: Free Bible Software Project -License: GPLv2 AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) +License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ # Source0 tarball is generated by sword_gen_free_tarball.sh, which documents # repack rationale and automates tarball fetching and repacking From 8d87410824e5a5d70939a5a8878bddce431e8752 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 04:59:42 +0000 Subject: [PATCH 10/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index bd05b64..f81c4c0 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:1.9.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Sep 29 2023 Aaron Rainbolt - 1:1.9.0-22 - Replace distutils with setuptools in python setup scripts (rhbz#2220606) - Don't install the INSTALL file as part of the documentation From f3151a9cdf785c4d455281a9923a1f452ac5aa62 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Wed, 31 Jan 2024 20:16:20 +0000 Subject: [PATCH 11/27] Rebuild for ICU 74 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index f81c4c0..be6f1b0 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Wed Jan 31 2024 Pete Walter - 1:1.9.0-24 +- Rebuild for ICU 74 + * Sat Jan 27 2024 Fedora Release Engineering - 1:1.9.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 8ddee760f929e06c1abd5444e525dfc7ff42d846 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:06:40 +0200 Subject: [PATCH 12/27] Rebuilt for Python 3.13 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index be6f1b0..800fe6f 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Fri Jun 07 2024 Python Maint - 1:1.9.0-25 +- Rebuilt for Python 3.13 + * Wed Jan 31 2024 Pete Walter - 1:1.9.0-24 - Rebuild for ICU 74 From c90940a0343272be4e7819fedc0e7bb10e039688 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 13:06:36 +0200 Subject: [PATCH 13/27] Perl 5.40 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 800fe6f..af37d40 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 1:1.9.0-26 +- Perl 5.40 rebuild + * Fri Jun 07 2024 Python Maint - 1:1.9.0-25 - Rebuilt for Python 3.13 From e11297126c722c7b7940588bc722f10667d91bf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 06:51:31 +0000 Subject: [PATCH 14/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index af37d40..3f3d52a 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Jitka Plesnikova - 1:1.9.0-26 - Perl 5.40 rebuild From cc86d291b2fd701ba6a12838118b8b52a2679867 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:47:18 +0000 Subject: [PATCH 15/27] Rebuild for ICU 76 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 3f3d52a..df75069 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 +- Rebuild for ICU 76 + * Sat Jul 20 2024 Fedora Release Engineering - 1:1.9.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 46af13b4317c784f6bc5184d4371c6bc8dc4faf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 12:07:25 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index df75069..217ae75 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Dec 08 2024 Pete Walter - 1:1.9.0-28 - Rebuild for ICU 76 From 5b21f8175bfb7be709b0031be528672d0ed855a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:44:59 +0200 Subject: [PATCH 17/27] Rebuilt for Python 3.14 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 217ae75..a45e018 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jun 02 2025 Python Maint - 1:1.9.0-30 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 1:1.9.0-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b29427f84d7bfac331dd43b73f61ee7c770698ef Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 7 Jul 2025 16:27:13 +0200 Subject: [PATCH 18/27] Perl 5.42 rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index a45e018..ec70548 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 +- Perl 5.42 rebuild + * Mon Jun 02 2025 Python Maint - 1:1.9.0-30 - Rebuilt for Python 3.14 From 59dccf301b41f71797d27dd1dbb6bc11327ac6a7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:58:24 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index ec70548..0465c6b 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -156,6 +156,9 @@ make tests %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 07 2025 Jitka Plesnikova - 1:1.9.0-31 - Perl 5.42 rebuild From 90aaa0eea0255a3c2ee1ab79483705b436dd4c96 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:02 -0500 Subject: [PATCH 20/27] Set minimum CMake version to 3.5 (rhbz#2381472) --- sword.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0465c6b..75ea453 100644 --- a/sword.spec +++ b/sword.spec @@ -91,7 +91,8 @@ Perl bindings for The SWORD Library. %autosetup -p1 %build -%cmake -DLIBSWORD_LIBRARY_TYPE=Shared \ +%cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ -DSWORD_BUILD_UTILS="Yes" \ From b731c1ca12f1455c47c37fe7a2a930eeea99b491 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:26:59 -0500 Subject: [PATCH 21/27] Set non-standard CMake variables back to expected values (rhbz#2381665) --- sword.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sword.spec b/sword.spec index 75ea453..10f2218 100644 --- a/sword.spec +++ b/sword.spec @@ -92,6 +92,13 @@ Perl bindings for The SWORD Library. %build %cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ + -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} \ + -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ + -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ + %endif -DLIBSWORD_LIBRARY_TYPE=Shared \ -DSWORD_PYTHON_3:BOOL=TRUE \ -DSWORD_PERL:BOOL=TRUE \ From b6db4ed1e7a72637c71ba8c164cab4a1bf7119ea Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:27:34 -0500 Subject: [PATCH 22/27] Migrate InstallMgr test to tmt framework (rhbz#2383081) --- .fmf/version | 1 + tests/installmgr.sh => installmgr_test.sh | 0 plans.fmf | 5 +++++ tests/tests.yml | 10 ---------- 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 .fmf/version rename tests/installmgr.sh => installmgr_test.sh (100%) create mode 100644 plans.fmf delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/tests/installmgr.sh b/installmgr_test.sh similarity index 100% rename from tests/installmgr.sh rename to installmgr_test.sh diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..8f58ed5 --- /dev/null +++ b/plans.fmf @@ -0,0 +1,5 @@ +summary: Run installmgr tests +discover: + how: fmf +execute: + script: installmgr_tests.sh diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d8f9dc2..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,10 +0,0 @@ -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - - container - tests: - - installmgr: - dir: . - run: installmgr.sh From a99ba19821b574552357f651f3f1f7fa078cb6db Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:29:50 -0500 Subject: [PATCH 23/27] Create changelog entry --- sword.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sword.spec b/sword.spec index 10f2218..9c9e262 100644 --- a/sword.spec +++ b/sword.spec @@ -164,6 +164,11 @@ make tests %changelog +* Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 +- Set minimum CMake version to 3.5 (rhbz#2381472) +- Set non-standard CMake variables back to expected values (rhbz#2381665) +- Migrate InstallMgr test to tmt framework (rhbz#2383081) + * Fri Jul 25 2025 Fedora Release Engineering - 1:1.9.0-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a65616c2a96dba85cb691267582dd715cec67c63 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Sat, 26 Jul 2025 21:35:46 -0500 Subject: [PATCH 24/27] Set the version number right --- sword.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 9c9e262..42d7688 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ From 61def2183b1175002fb599e9e78254e2a50a4d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:58:04 +0200 Subject: [PATCH 25/27] Rebuilt for icu 77.1 --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 42d7688..fa19cda 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 +- Rebuilt for icu 77.1 + * Sat Jul 26 2025 Aaron Rainbolt - 1:1.9.0-33 - Set minimum CMake version to 3.5 (rhbz#2381472) - Set non-standard CMake variables back to expected values (rhbz#2381665) From 1e2cc791e1efdbf04059695362e3100d8002b5a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:19:25 +0200 Subject: [PATCH 26/27] Rebuilt for Python 3.14.0rc2 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index fa19cda..0fe6dcd 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Aug 15 2025 Python Maint - 1:1.9.0-35 +- Rebuilt for Python 3.14.0rc2 bytecode + * Wed Aug 06 2025 František Zatloukal - 1:1.9.0-34 - Rebuilt for icu 77.1 From 9cc0caea74086d8dbf97c57d9d89048a1ac3fcc0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:58:40 +0200 Subject: [PATCH 27/27] Rebuilt for Python 3.14.0rc3 bytecode --- sword.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sword.spec b/sword.spec index 0fe6dcd..3fa6951 100644 --- a/sword.spec +++ b/sword.spec @@ -3,7 +3,7 @@ Name: sword Epoch: 1 Version: 1.9.0 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Free Bible Software Project License: GPL-2.0-only AND LicenseRef-Fedora-Public-Domain AND Apache-2.0 AND LGPL-2.0-or-later AND Zlib AND LGPL-2.1-or-later AND (0BSD OR MIT-0 OR MIT) URL: http://www.crosswire.org/sword/ @@ -164,6 +164,9 @@ make tests %changelog +* Fri Sep 19 2025 Python Maint - 1:1.9.0-36 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1:1.9.0-35 - Rebuilt for Python 3.14.0rc2 bytecode