From 0953e93d0015212109000c60e8ff9a8493aaca59 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Jul 05 2016 12:02:14 +0000 Subject: Update to 8.2.0 --- diff --git a/.gitignore b/.gitignore index 2c2ba28..4e04d1e 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ast-8.0.6.tar.gz /ast-8.0.7.tar.gz /ast-8.1.0.tar.gz +/ast-8.2.0.tar.gz diff --git a/ast-bundled.patch b/ast-bundled.patch index 3f290e8..9503785 100644 --- a/ast-bundled.patch +++ b/ast-bundled.patch @@ -1,7 +1,20 @@ -diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in ---- ast-8.1.0/Makefile.in.bundled 2016-03-24 15:54:43.116928732 -0600 -+++ ast-8.1.0/Makefile.in 2016-03-24 15:56:10.327361163 -0600 -@@ -266,10 +266,6 @@ am__objects_1 = libast_la-axis.lo libast +diff -up ast-8.2.0/Makefile.in.bundled ast-8.2.0/Makefile.in +--- ast-8.2.0/Makefile.in.bundled 2016-07-05 05:50:50.027938375 -0600 ++++ ast-8.2.0/Makefile.in 2016-07-05 05:52:21.033719284 -0600 +@@ -194,10 +194,8 @@ am__libast_la_SOURCES_DIST = axis.c box. + stccatalogentrylocation.h stcobsdatalocation.h timeframe.h \ + channel.h fitschan.h stcschan.h xmlchan.h ems.h err.h Ers.h \ + f77.h grf.h grf3d.h pg3d.h loader.h pal2ast.h erfa2ast.h \ +- wcsmath.h c2f77.h GRF_PAR AST_ERR cminpack/cminpack.h \ +- cminpack/cminpackP.h cminpack/lmder1.c cminpack/lmder.c \ +- cminpack/dpmpar.c cminpack/enorm.c cminpack/qrfac.c \ +- cminpack/lmpar.c cminpack/qrsolv.c proj.c tpn.c wcstrig.c ++ wcsmath.h c2f77.h GRF_PAR AST_ERR \ ++ proj.c tpn.c wcstrig.c + am__objects_1 = libast_la-axis.lo libast_la-box.lo \ + libast_la-channel.lo libast_la-circle.lo libast_la-cmpframe.lo \ + libast_la-cmpmap.lo libast_la-cmpregion.lo \ +@@ -268,10 +266,7 @@ am__objects_1 = libast_la-axis.lo libast am__objects_3 = am__objects_4 = $(am__objects_3) am__dirstamp = $(am__leading_dot)dirstamp @@ -9,10 +22,11 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in - cminpack/libast_la-lmder.lo cminpack/libast_la-dpmpar.lo \ - cminpack/libast_la-enorm.lo cminpack/libast_la-qrfac.lo \ - cminpack/libast_la-lmpar.lo cminpack/libast_la-qrsolv.lo ++am__objects_5 = am__objects_6 = libast_la-proj.lo libast_la-tpn.lo \ libast_la-wcstrig.lo am_libast_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ -@@ -1332,17 +1328,6 @@ PAL_FILES = \ +@@ -1337,17 +1332,6 @@ PAL_FILES = \ erfa.h \ erfam.h @@ -30,7 +44,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in bin_SCRIPTS = ast_link dist_bin_SCRIPTS = ast_link_adam noinst_SCRIPTS = ast_cpp -@@ -1409,13 +1394,13 @@ libast_la_SOURCES = \ +@@ -1414,13 +1398,13 @@ libast_la_SOURCES = \ $(WCSLIB_FILES) \ ast_err.h @@ -46,7 +60,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in # AST_PAR is really part of GRP_F_INCLUDE_FILES, but it must not be # distributed, so list it separately. -@@ -1470,7 +1455,7 @@ astbad_SOURCES = astbad.c pointset.h +@@ -1475,7 +1459,7 @@ astbad_SOURCES = astbad.c pointset.h # configure.ac, and so is not distributed automatically. # # makeh is required in order to build ast.h after distribution (see below). @@ -55,7 +69,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/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 -@@ -1623,26 +1608,6 @@ clean-libLTLIBRARIES: +@@ -1628,26 +1612,6 @@ clean-libLTLIBRARIES: echo rm -f $${locs}; \ rm -f $${locs}; \ } @@ -82,7 +96,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/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) -@@ -1770,8 +1735,6 @@ uninstall-dist_binSCRIPTS: +@@ -1775,8 +1739,6 @@ uninstall-dist_binSCRIPTS: mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -91,7 +105,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in distclean-compile: -rm -f *.tab.c -@@ -1920,13 +1883,6 @@ distclean-compile: +@@ -1927,13 +1889,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pal_la-palwrap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot3d_la-grf3d_pgplot.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libast_pgplot_la-grf_pgplot.Plo@am__quote@ @@ -105,7 +119,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ -@@ -3000,7 +2956,6 @@ mostlyclean-libtool: +@@ -3021,7 +2976,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs @@ -113,7 +127,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in distclean-libtool: -rm -f libtool config.lt -@@ -3712,8 +3667,6 @@ clean-generic: +@@ -3733,8 +3687,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) @@ -122,7 +136,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in maintainer-clean-generic: @echo "This command is intended for maintainers to use" -@@ -3733,7 +3686,6 @@ clean-am: clean-checkPROGRAMS clean-gene +@@ -3754,7 +3706,6 @@ clean-am: clean-checkPROGRAMS clean-gene distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -130,7 +144,7 @@ diff -up ast-8.1.0/Makefile.in.bundled ast-8.1.0/Makefile.in -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags -@@ -3786,7 +3738,6 @@ installcheck-am: +@@ -3807,7 +3758,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 765b476..ec16c8f 100644 --- a/ast-libs.patch +++ b/ast-libs.patch @@ -1,7 +1,7 @@ -diff -up ast-8.1.0/Makefile.in.libs ast-8.1.0/Makefile.in ---- ast-8.1.0/Makefile.in.libs 2016-03-24 15:53:46.036298365 -0600 -+++ ast-8.1.0/Makefile.in 2016-03-24 15:54:23.154057989 -0600 -@@ -332,7 +332,7 @@ libast_grf_5_6_la_LINK = $(LIBTOOL) $(AM +diff -up ast-8.2.0/Makefile.in.libs ast-8.2.0/Makefile.in +--- ast-8.2.0/Makefile.in.libs 2016-07-05 05:49:50.000713694 -0600 ++++ ast-8.2.0/Makefile.in 2016-07-05 05:50:30.970869981 -0600 +@@ -334,7 +334,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 $@ diff --git a/ast.spec b/ast.spec index 51c6022..8778ce9 100644 --- a/ast.spec +++ b/ast.spec @@ -1,7 +1,7 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: ast -Version: 8.1.0 +Version: 8.2.0 Release: 1%{?dist} Summary: A Library for Handling World Coordinate Systems in Astronomy @@ -129,6 +129,9 @@ make check %changelog +* Tue Jul 5 2016 Orion Poplawski 8.2.0-1 +- Update to 8.2.0 + * Thu Mar 24 2016 Fedora Release Engineering - 8.1.0-1 - Update to 8.1.0 - Rebase patches diff --git a/sources b/sources index 9cfcaae..fbcf7cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b4525c20446270d30004c9de506c2d7 ast-8.1.0.tar.gz +6e6083f89c5ae4a428b682228a824258 ast-8.2.0.tar.gz