From d4f559feaf07d62310bc10bf0c29359e72819736 Mon Sep 17 00:00:00 2001 From: Adam Huffman Date: Sep 05 2015 07:07:32 +0000 Subject: Disable upstreamed patches and path separator patch --- diff --git a/BEDTools.spec b/BEDTools.spec index d5d28d0..7acf036 100644 --- a/BEDTools.spec +++ b/BEDTools.spec @@ -18,10 +18,10 @@ Source0: https://github.com/arq5x/bedtools2/releases/download/v%{version}/bedtoo #Fix debuginfo canonicalization error #Patch disabled for now #Patch0: bedtools-debugedit.patch -Patch1: bedtools-gzstream-path.patch +#Patch1: bedtools-gzstream-path.patch #Temporary patches from upstream to fix compilation problem -Patch3: 107f803ec758427839c674be2af13742f0e2404f.patch -Patch4: b47dbefcb57f8e6c4fe397f64346338620740b71.patch +#Patch3: 107f803ec758427839c674be2af13742f0e2404f.patch +#Patch4: b47dbefcb57f8e6c4fe397f64346338620740b71.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #ExcludeArch: %{arm} #Disable i686 until upstream fixes GCC 5.1 compilation @@ -53,9 +53,9 @@ together. %prep %setup -q -n bedtools2 #%patch0 -p1 -b .BEDTools.debugedit -%patch1 -p1 -b .BEDTools.gzstream -%patch3 -p1 -b .BEDTools.types2 -%patch4 -p1 -b .BEDTools.types3 +#%patch1 -p1 -b .BEDTools.gzstream +#%patch3 -p1 -b .BEDTools.types2 +#%patch4 -p1 -b .BEDTools.types3 # remove bundled curl library rm -rf src/utils/curl @@ -108,6 +108,8 @@ rm -rf %{buildroot} %changelog * Sat Sep 05 2015 Adam Huffman - 2.25.0-1 - Update to latest upstream release 2.25.0 +- Disable upstreamed patches +- Disable double path separator patch for now * Sun Aug 23 2015 Adam Huffman - 2.24.0-6 - Fix binary directory path