orion pushed to ast (master). "Update to 8.0.4"

notifications at fedoraproject.org notifications at fedoraproject.org
Sat Apr 18 01:13:55 UTC 2015 

>From 43654941ed16d55963450d733d137dbe9ce110f0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Fri, 17 Apr 2015 19:13:48 -0600
Subject: Update to 8.0.4


diff --git a/.gitignore b/.gitignore
index 56c2f04..489f123 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /ast-8.0.0.tar.gz
 /ast-8.0.1.tar.gz
 /ast-8.0.2.tar.gz
+/ast-8.0.4.tar.gz
diff --git a/ast-bundled.patch b/ast-bundled.patch
index 218163e..7894bf4 100644
--- a/ast-bundled.patch
+++ b/ast-bundled.patch
@@ -1,6 +1,6 @@
-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
+diff -up ast-8.0.4/Makefile.in.bundled ast-8.0.4/Makefile.in
+--- ast-8.0.4/Makefile.in.bundled	2015-04-17 18:27:34.062273923 -0600
++++ ast-8.0.4/Makefile.in	2015-04-17 18:29:40.338469796 -0600
 @@ -215,10 +215,6 @@ am__objects_1 = libast_la-axis.lo libast
  am__objects_2 =
  am__objects_3 = $(am__objects_2)
@@ -55,7 +55,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  
  # AST_ERR and ast_err.h are `generated source files', and so must be
  # generated before any other compilations are done.  Note that these
-@@ -1558,26 +1543,6 @@ clean-libLTLIBRARIES:
+@@ -1559,26 +1544,6 @@ clean-libLTLIBRARIES:
  	  echo rm -f $${locs}; \
  	  rm -f $${locs}; \
  	}
@@ -82,7 +82,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  libast.la: $(libast_la_OBJECTS) $(libast_la_DEPENDENCIES) 
  	$(AM_V_CCLD)$(libast_la_LINK) -rpath $(libdir) $(libast_la_LDFLAGS) $(libast_la_OBJECTS) $(libast_la_LIBADD)  $(LIBS)
  libast_drama.la: $(libast_drama_la_OBJECTS) $(libast_drama_la_DEPENDENCIES) 
-@@ -1705,8 +1670,6 @@ uninstall-dist_binSCRIPTS:
+@@ -1706,8 +1671,6 @@ uninstall-dist_binSCRIPTS:
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
@@ -91,8 +91,8 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -1855,13 +1818,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libast_pal_la-pal.Plo at am__quote@
+@@ -1856,13 +1819,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libast_pal_la-palwrap.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libast_pgplot3d_la-grf3d_pgplot.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libast_pgplot_la-grf_pgplot.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at cminpack/$(DEPDIR)/libast_la-dpmpar.Plo at am__quote@
@@ -105,7 +105,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  
  .c.o:
  @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@@ -2790,55 +2746,6 @@ libast_la-zoommap.lo: zoommap.c
+@@ -2791,55 +2747,6 @@ libast_la-zoommap.lo: zoommap.c
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -c -o libast_la-zoommap.lo `test -f 'zoommap.c' || echo '$(srcdir)/'`zoommap.c
  
@@ -161,7 +161,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  libast_la-proj.lo: proj.c
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(STAR_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(libast_la_CFLAGS) $(CFLAGS) -MT libast_la-proj.lo -MD -MP -MF $(DEPDIR)/libast_la-proj.Tpo -c -o libast_la-proj.lo `test -f 'proj.c' || echo '$(srcdir)/'`proj.c
  @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libast_la-proj.Tpo $(DEPDIR)/libast_la-proj.Plo
-@@ -2935,7 +2842,6 @@ mostlyclean-libtool:
+@@ -2936,7 +2843,6 @@ mostlyclean-libtool:
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -169,7 +169,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  
  distclean-libtool:
  	-rm -f libtool config.lt
-@@ -3644,8 +3550,6 @@ clean-generic:
+@@ -3645,8 +3551,6 @@ clean-generic:
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
@@ -178,7 +178,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -3665,7 +3569,6 @@ clean-am: clean-checkPROGRAMS clean-gene
+@@ -3666,7 +3570,6 @@ clean-am: clean-checkPROGRAMS clean-gene
  
  distclean: distclean-am
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -186,7 +186,7 @@ diff -up ast-8.0.2/Makefile.in.bundled ast-8.0.2/Makefile.in
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
  	distclean-hdr distclean-libtool distclean-tags
-@@ -3718,7 +3621,6 @@ installcheck-am:
+@@ -3719,7 +3622,6 @@ installcheck-am:
  maintainer-clean: maintainer-clean-am
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
  	-rm -rf $(top_srcdir)/autom4te.cache
diff --git a/ast-libs.patch b/ast-libs.patch
index fcdcfd0..e7dddd2 100644
--- a/ast-libs.patch
+++ b/ast-libs.patch
@@ -1,12 +1,12 @@
-diff -up ast-7.3.4/Makefile.in.libs ast-7.3.4/Makefile.in
---- ast-7.3.4/Makefile.in.libs	2014-03-07 09:49:54.701740554 -0700
-+++ ast-7.3.4/Makefile.in	2014-03-07 09:50:33.242525031 -0700
-@@ -276,7 +276,7 @@ libast_grf_5_6_la_LINK = $(LIBTOOL) $(AM
+diff -up ast-8.0.4/Makefile.in.libs ast-8.0.4/Makefile.in
+--- ast-8.0.4/Makefile.in.libs	2015-04-17 18:26:03.489402991 -0600
++++ ast-8.0.4/Makefile.in	2015-04-17 18:26:37.909158168 -0600
+@@ -280,7 +280,7 @@ libast_grf_5_6_la_LINK = $(LIBTOOL) $(AM
  	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(libast_grf_5_6_la_CFLAGS) $(CFLAGS) $(STAR_LDFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 -libast_pal_la_LIBADD =
 +libast_pal_la_LIBADD = -lm
- am__objects_6 = libast_pal_la-pal.lo
+ am__objects_6 = libast_pal_la-palwrap.lo
  am_libast_pal_la_OBJECTS = $(am__objects_6)
  libast_pal_la_OBJECTS = $(am_libast_pal_la_OBJECTS)
diff --git a/ast.spec b/ast.spec
index 37c8c3e..0b8786e 100644
--- a/ast.spec
+++ b/ast.spec
@@ -1,7 +1,7 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           ast
-Version:        8.0.2
+Version:        8.0.4
 Release:        1%{?dist}
 Summary:        A Library for Handling World Coordinate Systems in Astronomy
 
@@ -73,7 +73,7 @@ C and Fortran programming documentation for %{name}.
 %patch0 -p1 -b .libs
 %patch1 -p1 -b .bundled
 rm -r cminpack erfa erfa.h erfam.h
-sed -i -e '/include.*erfa/d' pal.c
+sed -i -e '/include.*erfa/d' palwrap.c
 sed -i -e 's,cminpack/,cminpack-1/,' polymap.c
 sed -i -e '1i#!/bin/bash' ast_link*
 # Fix FSF address
@@ -129,6 +129,9 @@ make check
 
 
 %changelog
+* Fri Apr 17 2015 Orion Poplawski <orion at cora.nwra.com> 8.0.4-1
+- Update to 8.0.4
+
 * Mon Oct 20 2014 Orion Poplawski <orion at cora.nwra.com> 8.0.2-1
 - Update to 8.0.2
 
diff --git a/sources b/sources
index fa2c5eb..64a052f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08f4a40164a7d03b408a57a855155ea4  ast-8.0.2.tar.gz
+4bcd879f693e83215c0109b8b541b584  ast-8.0.4.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/ast.git/commit/?h=master&id=43654941ed16d55963450d733d137dbe9ce110f0

More information about the scm-commits mailing list