From 1e769dcac71d7cdd147ddf4875c44ae4b89971db Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Oct 30 2015 14:16:23 +0000 Subject: 6.6.0 --- diff --git a/.gitignore b/.gitignore index 70855a1..8c76ca2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ EMBOSS-6.3.1.tar.gz patch-1-4.gz /EMBOSS-6.4.0.tar.gz /patch-1-24.gz +/EMBOSS-6.6.0.tar.gz diff --git a/EMBOSS.spec b/EMBOSS.spec index c87a237..097d281 100644 --- a/EMBOSS.spec +++ b/EMBOSS.spec @@ -19,8 +19,8 @@ %define emhome %{_datadir}/EMBOSS Name: EMBOSS -Version: 6.4.0 -Release: 14%{?dist} +Version: 6.6.0 +Release: 1%{?dist} Summary: The European Molecular Biology Open Software Suite # Files under jemboss/, ajax/ensembl/ are LGPLv2+ @@ -41,29 +41,28 @@ Summary: The European Molecular Biology Open Software Suite License: GPLv2+ and LGPLv2+ and CC-BY and GPLv3+ and Public Domain URL: http://emboss.sf.net/ Source0: ftp://emboss.open-bio.org/pub/EMBOSS/%{name}-%{version}.tar.gz -Source1: ftp://emboss.open-bio.org/pub/EMBOSS/fixes/README.fixes +# Source1: ftp://emboss.open-bio.org/pub/EMBOSS/fixes/README.fixes %if %{with jemboss} Source2: jemboss.desktop %endif -# Upstream patch -Patch0: ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-24.gz # Use system-wide pcre. Sent upstream. Updated patch created on 2011-11-23. -Patch1: EMBOSS-6.4.0-system-pcre.patch +Patch1: EMBOSS-6.6.0-system-pcre.patch # Use system-wide plplot # Patch3: EMBOSS-6.3.1-system-plplot.patch # Use system-wide expat. Updated patch created on 2011-11-23. -Patch4: EMBOSS-6.4.0-system-expat.patch +Patch4: EMBOSS-6.6.0-system-expat.patch # Use system-wide zlib. Updated patch created on 2011-11-23. -Patch5: EMBOSS-6.4.0-system-zlib.patch +Patch5: EMBOSS-6.6.0-system-zlib.patch # Fedora-specific. Not sent upstream. Patch7: %{name}-fedora.patch -# Updated patch created on 2011-11-23. -Patch8: EMBOSS-6.4.0-system-hack.patch # Fix conflict with pscan (Fedora package, unrelated to EMBOSS) # https://bugzilla.redhat.com/show_bug.cgi?id=797804 # Emailed upstream on the issue on 2012-02-27 -Patch9: EMBOSS-6.4.0-fix-conflict-with-pscan.patch +Patch9: EMBOSS-6.6.0-fix-conflict-with-pscan.patch +# No, we don't need to run a non-existent binary to check across the network +# for updates. *sigh* +Patch10: EMBOSS-6.6.0-no-update.patch BuildRequires: gd-devel BuildRequires: pam-devel @@ -159,21 +158,18 @@ necessary for developing programs which will use the eplplot library. %prep %setup -q -%patch0 -p1 %patch1 -p1 -b .system-pcre -# %%patch3 -p1 -b .system-plplot %patch4 -p1 -b .system-expat %patch5 -p1 -b .system-zlib - %patch7 -p0 -b .fedora -%patch8 -p1 -b .system-hack %patch9 -p1 -b .fixconflict +%patch10 -p1 -b .noupdate -# Remove bundled expat, pcre and zlib to make sure that system versions are used -rm -rf ajax/{expat,pcre,zlib} +# Remove bundled expat, pcre and zlib files to make sure that system versions are used +rm -rf ajax/{expat,pcre,zlib}/* #install the patch readme -install -pm 644 %{SOURCE1} README.fixes +# install -pm 644 %{SOURCE1} README.fixes #these files were executable for some reason chmod 644 emboss/prettyplot.c emboss/polydot.c emboss/supermatcher.c @@ -326,6 +322,9 @@ desktop-file-install \ %{_includedir}/EMBOSS/eplplot/ %changelog +* Fri Oct 30 2015 Tom Callaway - 6.6.0-1 +- update to 6.6.0 + * Tue Jun 16 2015 Fedora Release Engineering - 6.4.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild @@ -381,7 +380,7 @@ desktop-file-install \ * Mon Feb 07 2011 Fedora Release Engineering - 6.3.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Wed Dec 10 2010 Tom "spot" Callaway - 6.3.1-8 +* Fri Dec 10 2010 Tom "spot" Callaway - 6.3.1-8 - split libeplplot into its own package * Tue Nov 9 2010 Tom "spot" Callaway - 6.3.1-7 diff --git a/sources b/sources index 39e789e..f395ba3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -54993a22064222b01bd4fc8086f7684d EMBOSS-6.4.0.tar.gz -0b84d6012076308f544505379834e630 patch-1-24.gz +cc3fca80cb0618deb10fa0d29fe90e4b EMBOSS-6.6.0.tar.gz