diff --git a/.gitignore b/.gitignore index 2911c1c..4443d70 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /bowtie-src-x86_64.zip /bowtie-1.3.0-src.zip /bowtie-1.3.0-tests.tgz +/bowtie-1.3.1-src.zip +/bowtie-1.3.1-tests.tgz diff --git a/bowtie-fix-ppc64le-s390x-asm-pause-error.patch b/bowtie-fix-ppc64le-s390x-asm-pause-error.patch deleted file mode 100644 index b25b6da..0000000 --- a/bowtie-fix-ppc64le-s390x-asm-pause-error.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ea04fb256aa01ca1252613c5d5de3c9e2d6327ee Mon Sep 17 00:00:00 2001 -From: Rone Charles -Date: Mon, 27 Jul 2020 19:19:34 -0400 -Subject: [PATCH] Potential fix for cpu_backoff related errors on ppc - ---- - bt2_locks.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/bt2_locks.h b/bt2_locks.h -index b956ea4..cddbd8b 100644 ---- a/bt2_locks.h -+++ b/bt2_locks.h -@@ -12,13 +12,17 @@ - class cpu_backoff { - public: - cpu_backoff(): count(1) {} -- void pause() { -+ inline void pause() { - if (count <= LOOPS_BEFORE_YIELD) { - for (int32_t i = 0; i < count; i++) { - #ifdef __aarch64__ - __asm__ __volatile__("yield" ::: "memory"); --#else -+#elif __ppc__ -+ __asm__ __volatile__("or 27,27,27" ::: "memory"); -+#elif __x86_64__ - __asm__ __volatile__("pause;"); -+#else -+ // do nothing - #endif - } - count *= 2; --- -2.26.2 - diff --git a/bowtie-test-remove-perl-Sys-Info-dep.patch b/bowtie-test-remove-perl-Sys-Info-dep.patch index 38cf208..e31034a 100644 --- a/bowtie-test-remove-perl-Sys-Info-dep.patch +++ b/bowtie-test-remove-perl-Sys-Info-dep.patch @@ -11,7 +11,7 @@ index d8b452f..ad932f5 100755 my $bowtie = ""; my $bowtie_build = ""; -@@ -1130,9 +1128,8 @@ sub runbowtie($$$$$$$$$$$$$$$$$$$$$$$) { +@@ -995,9 +993,8 @@ sub runbowtie($$$$$$$$$$$$$$$$$$$$$$$) { while() { print $_; } close(FA); if($do_build) { diff --git a/bowtie.spec b/bowtie.spec index b12e952..577d09a 100644 --- a/bowtie.spec +++ b/bowtie.spec @@ -1,6 +1,6 @@ Name: bowtie -Version: 1.3.0 -Release: 6%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: An ultrafast, memory-efficient short read aligner # bowite: Artistic 2.0 @@ -10,12 +10,9 @@ URL: http://bowtie-bio.sourceforge.net/index.shtml Source0: http://downloads.sourceforge.net/%{name}-bio/%{name}-%{version}-src.zip # git clone https://github.com/BenLangmead/bowtie.git # cd bowtie -# git checkout v1.3.0 -# tar czvf bowtie-1.3.0-tests.tgz scripts/test/ +# git checkout v1.3.1 +# tar czvf bowtie-1.3.1-tests.tgz scripts/test/ Source1: bowtie-%{version}-tests.tgz -# Fix bt2_locks.h: Error: Unrecognized opcode: `pause' on ppc64le/s390x. -# https://github.com/BenLangmead/bowtie/issues/114 -Patch0: bowtie-fix-ppc64le-s390x-asm-pause-error.patch # Remove perl-Sys-Info module depenency, as it does not exist on Fedora. Patch1: bowtie-test-remove-perl-Sys-Info-dep.patch Requires: python3 @@ -54,8 +51,6 @@ sequences to the human genome. Genome Biol 10:R25. %prep %setup -q -n %{name}-%{version}-src -%patch0 -p1 - # Remove the directory to avoid building bowtie with bundled libraries. rm -rf third_party/ @@ -73,6 +68,14 @@ done export POPCNT_CAPABILITY=0 %endif +# A workaround to pass the tests. +# Cline paired 2 (fw:1, sam:1) test aborted with -Wp,-D_GLIBCXX_ASSERTIONS +# https://github.com/BenLangmead/bowtie/issues/136 +CFLAGS=$(echo "${CFLAGS}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//') +export CFLAGS +CXXFLAGS=$(echo "${CXXFLAGS}" | sed -e 's/-Wp,-D_GLIBCXX_ASSERTIONS//') +export CXXFLAGS + # Set debug flag "-g" to prevent the error # "Empty %%files file debugsourcefiles.list". %make_build allall EXTRA_FLAGS="-g" @@ -130,6 +133,10 @@ scripts/test/simple_tests.pl --bowtie=./bowtie --bowtie-build=./bowtie-build %changelog +* Fri Feb 17 2023 Jun Aruga - 1.3.1-1 +- Update to upstream release 1.3.1 + Resolves: rhbz#2003918 + * Wed Jan 18 2023 Fedora Release Engineering - 1.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a7a2dcf..f32bc1c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bowtie-1.3.0-src.zip) = 27c33221a395de6dbf086c63befd007ac6033ab0fca6ce6b79b6c13de6bd02d5585c0c38c442e50dca5cdf95cfca136310ace334bbf24ac90e8e7aece93001a7 -SHA512 (bowtie-1.3.0-tests.tgz) = 9e25cbba3da9085b8427a0e2df77c21864c7bfbf51aced784362873c801bee92a95456bbd5b1ea02bf4a4443edba748e830fe9b8fea95f0c61e37f6297f4383c +SHA512 (bowtie-1.3.1-src.zip) = bc23e1e4273a595abd7c64712d829d51808be7d83e6f7778837b31f19a077d14e197ba9ed1516b00e5543bc3ec2fdb6ab5a4a04ed2c7fd32859e0f09c1167bb5 +SHA512 (bowtie-1.3.1-tests.tgz) = 6332221def9c6ce7b0e5d9eedd671c4b706a66e51458b047c9c98973fa5efa310978aa7bc76405f8126266eb33e2f32f70fd7c2c400b256c9587d2cb9dc4d23b