diff --git a/.gitignore b/.gitignore index cbed6f5..13e11b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /dssp-2.2.1.tgz +/dssp-tuple.patch +/dssp-3.0.0.tgz diff --git a/dssp.spec b/dssp.spec index f7c48ab..63ac6c3 100644 --- a/dssp.spec +++ b/dssp.spec @@ -2,8 +2,8 @@ # The licence for this file is as for the package itself. Name: dssp -Version: 2.2.1 -Release: 16%{?dist} +Version: 3.0.0 +Release: 1%{?dist} Summary: Protein secondary structure assignment %{?el5:Group: Applications/Engineering} License: Boost @@ -11,14 +11,10 @@ URL: http://swift.cmbi.ru.nl/gv/dssp/ Source0: ftp://ftp.cmbi.ru.nl/pub/software/dssp/dssp-%version.tgz # don't suppress make output Patch1: dssp-make.patch - +# Fix build with boost 1.66 (#1537546) +Patch2: dssp-tuple.patch BuildRequires: zlib-devel bzip2-devel -%if 0%{?el5} -BuildRequires: boost141-devel -%else BuildRequires: boost-devel -%endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %if 0%{?epel} < 7 %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} @@ -56,13 +52,8 @@ if [ -f %{_libdir}/%{?el5:boost141/}libboost_thread-mt.so ]; then else echo "BOOST_LIB_SUFFIX = " > make.config fi -%if 0%{?el5} -echo "CFLAGS=$RPM_OPT_FLAGS -I/usr/include/boost141 -LDOPTS=%__global_ldflags -L%_libdir/boost141" >>make.config -%else echo "CFLAGS=$RPM_OPT_FLAGS -I/usr/include LDOPTS=%__global_ldflags -L%_libdir" >>make.config -%endif # The original makefile uses -O3, presumably for good reason, but # avoid compiler ICE on ppc64le (#1280387). %ifarch ppc64le @@ -72,15 +63,10 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DEST_DIR=%_prefix DESTDIR=$RPM_BUILD_ROOT chmod -x $RPM_BUILD_ROOT%_mandir/man1/* -%clean -rm -rf $RPM_BUILD_ROOT - - %{!?_licensedir:%global license %%doc} %files %license LICENSE_1_0.txt @@ -90,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 23 2018 Dave Love - 3.0.0-1 +- New version +- Clean up el5-isms +- Patch to fix #1537546 + * Wed Aug 02 2017 Fedora Release Engineering - 2.2.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index a600a84..8246eda 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -0faa63ea1f0c69def077530de0cf84c1 dssp-2.2.1.tgz +SHA512 (dssp-tuple.patch) = 6b89748c36201d9eaea98c6982f09a490722063571aab9d715a28a48fecd7253b043e0b428227ea652eefd5b374910fe16c9cc7fb1201ed518d30a093f1db993 +SHA512 (dssp-3.0.0.tgz) = 73ad511d1a7f928b9ffee7d789014ab51acbfbe467115cd5477d3ce2ebeede5e0c2440cb7c61c3288ec9e477bc07f52fcbf5f10c14c5f9ca039bb41558f04250