Apply the c++11 patches only to Fedora >= 24 (where g++ implements gnu++14)

This commit is contained in:
José Matos 2016-02-25 15:45:27 +00:00
parent c122b5d5ea
commit b1410eec24
1 changed files with 10 additions and 4 deletions

View File

@ -1,6 +1,6 @@
Name: mmseq
Version: 1.0.8a
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Haplotype and isoform specific expression estimation for RNA-seq
Group: Applications/Engineering
@ -36,10 +36,14 @@ estimation using multi-mapping RNA-seq reads. Example scripts are included.
#%%patch1 -p1 -b .mmseq-flags.patch
#Fix zlib linking
%patch2 -p1 -b .mmseq-zlib.patch
# Apply c++11 patches for gcc >= 6
%if 0%{?fedora} >= 24
#Fix for C++11 iostream changes
%patch3 -p1 -b .mmseq-iostream-c++11.patch
#Fix for C++11 static data member initialization changes
%patch4 -p1 -b .mmseq-static-data-members-initialization-c++11.patch
%endif
#Remove bundled binaries
rm bin/*-linux
@ -75,7 +79,7 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%doc README.md COPYING doc/
%{_bindir}/bam2hits
%{_bindir}/extract_transcripts
%{_bindir}/extract_transcripts
%{_bindir}/hitstools
%{_bindir}/mmcollapse
%{_bindir}/mmdiff
@ -92,6 +96,9 @@ rm -rf %{buildroot}
%changelog
* Thu Feb 25 2016 José Matos <jamatos@fedoraproject.org> - 1.0.8a-12
- Apply the c++11 patches only to Fedora >= 24 (where g++ implements gnu++14)
* Mon Feb 22 2016 Orion Poplawski <orion@cora.nwra.com> - 1.0.8a-11
- Rebuild for gsl 2.1
@ -176,7 +183,7 @@ rm -rf %{buildroot}
- rebuild for new Boost in Rawhide
* Fri Oct 7 2011 Adam Huffman <bloch@verdurin.com> - 0.9.14-1
- new upstream bugfix release
- new upstream bugfix release
* Wed Aug 17 2011 Adam Huffman <bloch@verdurin.com> - 0.9.12-1
- upstream release 0.9.12 fixing a possible segfault
@ -212,4 +219,3 @@ rm -rf %{buildroot}
* Mon Apr 4 2011 Adam Huffman <bloch@verdurin.com> - 0.9.9-1
- initial version