Hello community,

here is the log from the commit of package bowtie2 for openSUSE:Factory checked 
in at 2020-06-15 20:32:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bowtie2 (Old)
 and      /work/SRC/openSUSE:Factory/.bowtie2.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "bowtie2"

Mon Jun 15 20:32:38 2020 rev:4 rq:814674 version:2.4.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/bowtie2/bowtie2.changes  2020-05-29 
21:37:40.674703602 +0200
+++ /work/SRC/openSUSE:Factory/.bowtie2.new.3606/bowtie2.changes        
2020-06-15 20:32:43.666844564 +0200
@@ -1,0 +2,6 @@
+Mon Jun 15 09:21:50 UTC 2020 - Pierre Bonamy <fl...@mailoo.org>
+
+- Added bowtie2-processor_support.patch to fix GCC10 build fail
+- Added %fdupes in the spec files to handle duplicated binary files
+
+-------------------------------------------------------------------

New:
----
  bowtie2-processor_support.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bowtie2.spec ++++++
--- /var/tmp/diff_new_pack.VzXpFO/_old  2020-06-15 20:32:44.510847594 +0200
+++ /var/tmp/diff_new_pack.VzXpFO/_new  2020-06-15 20:32:44.514847609 +0200
@@ -30,7 +30,9 @@
 Source1:        simde-0.0~git20190101.422ed9c.tar.xz
 # PATCH-FIX-UPSTREAM bowtie2-cmake-install-targets.patch 
gh#BenLangmead/bowtie2#292 badshah...@gmail.com -- Add install targets to cmake 
scripts and fix tests; patch taken from upstream git
 Patch0:         bowtie2-cmake-install-targets.patch
+Patch1:         bowtie2-processor_support.patch
 BuildRequires:  cmake
+BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
 BuildRequires:  tbb-devel
@@ -50,6 +52,7 @@
 %setup -q
 %setup -q -b 1
 %patch0 -p1
+%patch1 -p1
 pushd third_party
 rmdir simde
 ln -s ../../simde-*/ simde
@@ -77,6 +80,8 @@
 sed -i "s:%{_bindir}/env perl:${perlbin}:" %{buildroot}%{_bindir}/bowtie2
 sed -i "s:%{_bindir}/env python:%{_bindir}/python:" 
%{buildroot}%{_bindir}/bowtie2-{build,inspect}
 
+%fdupes %{buildroot}%{_bindir}
+
 %files
 %doc AUTHORS MANUAL NEWS TUTORIAL VERSION
 %license LICENSE

++++++ bowtie2-processor_support.patch ++++++
--- a/processor_support.h
+++ b/processor_support.h
@@ -49,7 +49,7 @@
 #elif defined(USING_GCC_COMPILER)
         __get_cpuid(0x1, &regs.EAX, &regs.EBX, &regs.ECX, &regs.EDX);
 #else
-        std::cerr << “ERROR: please define __cpuid() for this build.\n”; 
+        std::cerr << "ERROR: please define __cpuid() for this build.\n"; 
         assert(0);
 #endif
         if( !( (regs.ECX & BIT(20)) && (regs.ECX & BIT(23)) ) ) return false;

Reply via email to