[ast] Update source to new tarball and URL Drop FSF address fixes applied upstream

[Orion Poplawski]

commit e4d1bdb3e877cc1e5c080c08b2c51d25bd95b6ca
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jan 12 11:18:58 2012 -0700

    Update source to new tarball and URL
    Drop FSF address fixes applied upstream

 .gitignore |    1 +
 ast.spec   |   18 +++++++++---------
 sources    |    2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6154045..7378d0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ast-6.0-1.tar.gz
+/ast-6.0.1.tar.gz
diff --git a/ast.spec b/ast.spec
index 0f619a1..b02f823 100644
--- a/ast.spec
+++ b/ast.spec
@@ -1,16 +1,13 @@
-%global srcver  6.0-1
-
 Name:           ast
-Version:        %(echo %srcver | sed s/-/./)
-Release:        1%{?dist}
+Version:        6.0.1
+Release:        2%{?dist}
 Summary:        A Library for Handling World Coordinate Systems in Astronomy
 
 Group:          System Environment/Libraries
 # proj.c proj.h wcsmath.h wcstrig.c wcstrig.h are LGPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            http://starlink.jach.hawaii.edu/starlink/AST
-#http://starlink.jach.hawaii.edu/starlink/AST?action=AttachFile&do=view&target=ast-%{srcver}.tar.gz
-Source0:        ast-%{srcver}.tar.gz
+Source0:        http://www.starlink.ac.uk/download/ast/ast-%{version}.tar.gz
 # Fix up library linkages
 Patch0:         ast-libs.patch
 
@@ -66,12 +63,11 @@ C and Fortran programming documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{srcver}
+%setup -q
 %patch0 -p1 -b .libs
 sed -i -e '1i#!/bin/bash' ast_link*
 # Fix FSF address
-sed -i -e 's/59 Temple Place, Suite 330, Boston, MA *02111-1307/51 Franklin Street, Fifth Floor, Boston, MA  02110-1301/' LICENCE pal.*
-sed -i -e 's/675 Mass Ave, Cambridge, MA 02139/51 Franklin Street, Fifth Floor, Boston, MA  02110-1301/' COPYING.LIB loader.h proj.* wcstrig.*
+sed -i -e 's/675 Mass Ave, Cambridge, MA 02139/51 Franklin Street, Fifth Floor, Boston, MA  02110-1301/' proj.* wcstrig.*
 
 
 %build
@@ -116,6 +112,10 @@ make check
 
 
 %changelog
+* Thu Jan 12 2012 Orion Poplawski <orion at cora.nwra.com> 6.0.1-2
+- Update source to new tarball and URL
+- Drop FSF address fixes applied upstream
+
 * Mon Nov 28 2011 Orion Poplawski <orion at cora.nwra.com> 6.0.1-1
 - Update to 6.0-1
 - Fixup some lib linkages
diff --git a/sources b/sources
index 6a6b891..9e77c7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4323e66e207fcb0410e0a47db8fded52  ast-6.0-1.tar.gz
+bedd41b7ba1d978fc5e86b2ac853b451  ast-6.0.1.tar.gz