[ast] Update to 8.0.2

Orion Poplawski orion at fedoraproject.org
Mon Oct 20 17:56:29 UTC 2014


commit d12da456a0eb53175bb299d1fcd43a44e11a432e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Oct 20 11:56:30 2014 -0600

    Update to 8.0.2

 .gitignore        |    1 +
 ast-bundled.patch |   10 +-
 ast-format.patch  |  803 -----------------------------------------------------
 ast.spec          |   12 +-
 sources           |    2 +-
 5 files changed, 11 insertions(+), 817 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 00136f9..56c2f04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ast-7.3.4.tar.gz
 /ast-8.0.0.tar.gz
 /ast-8.0.1.tar.gz
+/ast-8.0.2.tar.gz
diff --git a/ast-bundled.patch b/ast-bundled.patch
index 774bf8b..218163e 100644
--- a/ast-bundled.patch
+++ b/ast-bundled.patch
@@ -1,6 +1,6 @@
-diff -up ast-8.0.1/Makefile.in.bundled ast-8.0.1/Makefile.in
---- ast-8.0.1/Makefile.in.bundled	2014-10-18 10:23:40.032118633 -0600
-+++ ast-8.0.1/Makefile.in	2014-10-18 10:24:34.416253508 -0600
+diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
+--- ast-8.0.2/Makefile.in.bundled	2014-10-20 11:21:09.242619151 -0600
++++ ast-8.0.2/Makefile.in	2014-10-20 11:21:54.601386197 -0600
 @@ -215,10 +215,6 @@ am__objects_1 = libast_la-axis.lo libast
  am__objects_2 =
  am__objects_3 = $(am__objects_2)
@@ -50,8 +50,8 @@ diff -up ast-8.0.1/Makefile.in.bundled ast-8.0.1/Makefile.in
  # configure.ac, and so is not distributed automatically.
  #
  # makeh is required in order to build ast.h after distribution (see below).
--EXTRA_DIST = ast_par.source sun210_figures/ sun211_figures/ pal/ erfa/ cminpack/
-+EXTRA_DIST = ast_par.source sun210_figures/ sun211_figures/ pal/ erfa/
+-EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa cminpack
++EXTRA_DIST = ast_par.source sun210_figures sun211_figures pal erfa
  
  # AST_ERR and ast_err.h are `generated source files', and so must be
  # generated before any other compilations are done.  Note that these
diff --git a/ast.spec b/ast.spec
index b2ea924..37c8c3e 100644
--- a/ast.spec
+++ b/ast.spec
@@ -1,7 +1,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           ast
-Version:        8.0.1
+Version:        8.0.2
 Release:        1%{?dist}
 Summary:        A Library for Handling World Coordinate Systems in Astronomy
 
@@ -14,8 +14,6 @@ Source0:        http://www.starlink.ac.uk/download/ast/ast-%{version}.tar.gz
 Patch0:         ast-libs.patch
 # Remove bundled cminpack and erfa
 Patch1:         ast-bundled.patch
-# Fix compile with -Werror=format-security
-Patch2:         ast-format.patch
 
 BuildRequires:  gcc-gfortran
 BuildRequires:  cminpack-devel
@@ -74,17 +72,12 @@ C and Fortran programming documentation for %{name}.
 %setup -q
 %patch0 -p1 -b .libs
 %patch1 -p1 -b .bundled
-%patch2 -p1 -b .format
 rm -r cminpack erfa erfa.h erfam.h
 sed -i -e '/include.*erfa/d' pal.c
 sed -i -e 's,cminpack/,cminpack-1/,' polymap.c
 sed -i -e '1i#!/bin/bash' ast_link*
 # Fix FSF address
 sed -i -e 's/675 Mass Ave, Cambridge, MA 02139/51 Franklin Street, Fifth Floor, Boston, MA  02110-1301/' COPYING.LIB proj.* wcstrig.*
-# Fix pal location
-mv pal palold
-mv palold/pal .
-rmdir palold
 
 
 %build
@@ -136,6 +129,9 @@ make check
 
 
 %changelog
+* Mon Oct 20 2014 Orion Poplawski <orion at cora.nwra.com> 8.0.2-1
+- Update to 8.0.2
+
 * Sat Oct 18 2014 Orion Poplawski <orion at cora.nwra.com> 8.0.1-1
 - Update to 8.0.1
 - Add patch to compile with -Werror=format-security
diff --git a/sources b/sources
index 4a9aeec..fa2c5eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ff3015612f9b98d4ae866a47b19c869  ast-8.0.1.tar.gz
+08f4a40164a7d03b408a57a855155ea4  ast-8.0.2.tar.gz


More information about the scm-commits mailing list