16 changed files with 469 additions and 607 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,12 +21,3 @@
 /astrometry.net-0.75-clean.tar.xz
 /astrometry.net-0.76-clean.tar.xz
 /astrometry.net-0.78-clean.tar.xz
-/astrometry.net-0.89-clean.tar.xz
-/astrometry.net-0.91-clean.tar.xz
-/astrometry.net-0.94-clean.tar.xz
-/astrometry-data-4107-4119.tar.zst
-/astrometry-data-5206.tar.zst
-/astrometry-data-5205.tar.zst
-/astrometry.net-0.96-clean.tar.xz
-/astrometry.net-0.97-clean.tar.xz
-/astrometry.net-0.98-clean.tar.xz
--- a/Don-t-copy-demo-files-to-examples.patch
+++ b/Don-t-copy-demo-files-to-examples.patch
@ -1,20 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 28 Apr 2020 09:27:14 +0200
-Subject: Don't copy demo files to examples
-
---
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 4b3fc9c..5c6b104 100644
--- a/Makefile
-+++ b/Makefile
-@@ -174,7 +174,6 @@ install-core:
- 	$(MKDIR) '$(MAN1_INSTALL_DIR)'
- 	$(CP) __init__.py '$(PY_BASE_INSTALL_DIR)'
- 	$(CP) CREDITS LICENSE README.md report.txt '$(DOC_INSTALL_DIR)'
-	$(CP) demo/* '$(EXAMPLE_INSTALL_DIR)'
- 	$(CP) man/*.1 '$(MAN1_INSTALL_DIR)'
- 	$(MAKE) -C util  install-core
- 	$(MAKE) -C catalogs install
--- a/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch
+++ b/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch
@ -1,24 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 1 Dec 2016 21:18:56 +0100
-Subject: Fix shared lib flags so that the package can be built on s390x
-
---
- util/makefile.common | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/util/makefile.common b/util/makefile.common
-index 1d40053..315e78f 100644
--- a/util/makefile.common
-+++ b/util/makefile.common
-@@ -172,9 +172,8 @@ FLAGS_DEF += $(shell $(CCTEST))
- ## environment variable in your shell.
- ## With gcc 4.2 and later, gcc should be able to make the optimal choice on its own.
- ## See the README section "I wanna go fast!" for more details.
-ifneq ($(origin ARCH_FLAGS),undefined)
-  FLAGS_DEF += $(ARCH_FLAGS)
-else
-+ARCH_FLAGS := "system"
-+ifndef ARCH_FLAGS
-   # Try to guess some good compiler flags for this CPU.
- 
-   # Use -march=native if it's available (gcc 4.2 and above)
--- a/Remove-errornous-generation-of-net-client.py.patch
+++ b/Remove-errornous-generation-of-net-client.py.patch
@ -1,26 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Fri, 15 Nov 2019 20:40:20 +0100
-Subject: Remove errornous generation of net/client.py
-
---
- Makefile | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 3870c68..4b3fc9c 100644
--- a/Makefile
-+++ b/Makefile
-@@ -182,13 +182,6 @@ install-core:
- 	$(MAKE) -C qfits-an install
- 	$(MAKE) -C solver install
- 	$(MAKE) -C sdss install
-	$(MKDIR) -p '$(PY_BASE_INSTALL_DIR)'/net/client
-	@for x in net/client/client.py; do \
-		echo $(SED) 's+$(PYTHON_SCRIPT_DEFAULT)+$(PYTHON_SCRIPT)+' $$x > '$(PY_BASE_INSTALL_DIR)/'$$x; \
-		$(SED) 's+$(PYTHON_SCRIPT_DEFAULT)+$(PYTHON_SCRIPT)+' $$x > '$(PY_BASE_INSTALL_DIR)/'$$x; \
-		echo $(CHMOD_EXECUTABLE) '$(PY_BASE_INSTALL_DIR)/'$$x; \
-		$(CHMOD_EXECUTABLE) '$(PY_BASE_INSTALL_DIR)/'$$x; \
-	done
- .PHONY: install install-core
- 
- install-cfitsio-utils:
--- a/Remove-horizons.py-from-Python-package.patch
+++ b/Remove-horizons.py-from-Python-package.patch
@ -1,23 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Tue, 19 Nov 2024 09:08:06 +0100
-Subject: Remove horizons.py from Python package
-
-This file is not Python 3.13 compliant because telnetlib was removed.
-Closes: #1084555
---
- util/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/Makefile b/util/Makefile
-index 95835a1..27b6ecb 100644
--- a/util/Makefile
-+++ b/util/Makefile
-@@ -186,7 +186,7 @@ PYTHON_INSTALL := image2pnm.py addpath.py \
- 	uniformize.py \
- 	usnob_catalog.py usnob_get_image.py usnob_get_region.py \
- 	find_data_file.py plotshift.py plotutils.py miscutils.py multiproc.py \
-	ttime.py resample.py EXIF.py horizons.py \
-+	ttime.py resample.py EXIF.py \
- 	imageutils.py siap.py stages.py timingpool.py
- 
- # celestial_mechanics.py (needs license)
--- a/Replace-removed-Python-2-C-API-macros-for-SWIG-4.5.0.patch
+++ b/Replace-removed-Python-2-C-API-macros-for-SWIG-4.5.0.patch
@ -1,110 +0,0 @@
-diff -up astrometry.net-0.98/libkd/pyspherematch.c.swig45 astrometry.net-0.98/libkd/pyspherematch.c
--- astrometry.net-0.98/libkd/pyspherematch.c.swig45	2026-07-27 16:59:31.982121322 +0200
-+++ astrometry.net-0.98/libkd/pyspherematch.c	2026-07-27 16:59:31.988237938 +0200
-@@ -7,7 +7,7 @@
- 
- #if PY_MAJOR_VERSION >= 3
- #define IS_PY3K
-#define PyInt_FromLong PyLong_FromLong
-+#define PyLong_FromLong PyLong_FromLong
- #endif
- 
- #include <stdio.h>
-@@ -458,7 +458,7 @@ static PyMethodDef kdtree_methods[] = {
- };
- 
- static PyObject* KdTree_n(KdObject* self, void* closure) {
-    return PyInt_FromLong(kdtree_n(self->kd));
-+    return PyLong_FromLong(kdtree_n(self->kd));
- }
- 
- static PyObject* KdTree_bbox(KdObject* self, void* closure) {
-@@ -564,9 +564,9 @@ static void callback_dualtree2(void* v,
-         lst = PyList_New(1);
-         // SetItem steals a ref -- that's what we want.
-         PyList_SetItem(dt->indlist, ind1, lst);
-        PyList_SET_ITEM(lst, 0, PyInt_FromLong(ind2));
-+        PyList_SET_ITEM(lst, 0, PyLong_FromLong(ind2));
-     } else {
-        PyList_Append(lst, PyInt_FromLong(ind2));
-+        PyList_Append(lst, PyLong_FromLong(ind2));
-     }
- }
- 
-diff -up astrometry.net-0.98/plot/plotstuff.i.swig45 astrometry.net-0.98/plot/plotstuff.i
--- astrometry.net-0.98/plot/plotstuff.i.swig45	2026-07-27 16:59:31.983121343 +0200
-+++ astrometry.net-0.98/plot/plotstuff.i	2026-07-27 17:16:11.176233377 +0200
-@@ -125,7 +125,7 @@ void free(void* ptr);
-         Py_DECREF($result);
-         $result = PyList_New(3);
-         for (i=0; i<3; i++) {
-            PyObject *o = PyInt_FromLong((long)$1[i]);
-+            PyObject *o = PyLong_FromLong((long)$1[i]);
-             PyList_SetItem($result,i,o);
-         }
-     }
-@@ -142,7 +142,7 @@ void free(void* ptr);
-     for (i=0; i<3; i++) {
-         PyObject *o = PySequence_GetItem($input, i);
-         if (PyNumber_Check(o)) {
-            temp[i] = (int)PyInt_AsLong(o);
-+            temp[i] = (int)PyLong_AsLong(o);
-         } else {
-             PyErr_SetString(PyExc_ValueError,"Sequence elements must be numbers");
-             return NULL;
-diff -up astrometry.net-0.98/util/index_pyutils.c.swig45 astrometry.net-0.98/util/index_pyutils.c
--- astrometry.net-0.98/util/index_pyutils.c.swig45	2026-07-27 16:59:31.985121387 +0200
-+++ astrometry.net-0.98/util/index_pyutils.c	2026-07-27 16:59:31.989357569 +0200
-@@ -70,7 +70,7 @@ static PyObject* qidxfile_get_quad_list(
- static PyObject* pyval_int(void* v, int index) {
-     PyObject* pyval;
-     int* i = (int*)v;
-    pyval = PyInt_FromLong((long)i[index]);
-+    pyval = PyLong_FromLong((long)i[index]);
-     assert(pyval);
-     return pyval;
- }
-diff -up astrometry.net-0.98/util/util.i.swig45 astrometry.net-0.98/util/util.i
--- astrometry.net-0.98/util/util.i.swig45	2026-07-27 16:59:31.986121408 +0200
-+++ astrometry.net-0.98/util/util.i	2026-07-27 17:16:11.177220170 +0200
-@@ -915,7 +915,7 @@ def lanczos_shift_image(img, dx, dy, ord
-   D = $1->dimquads;
-   $result = PyList_New(D);
-   for (i = 0; i < D; i++) {
-      PyObject *o = PyInt_FromLong($3[i]);
-+      PyObject *o = PyLong_FromLong($3[i]);
-       PyList_SetItem($result, i, o);
-   }
- }
-@@ -990,11 +990,11 @@ long quadfile_addr(index_t* ind);
-   int i;
-   int nn;
-   // convert $result to nn
-  //nn = (int)PyInt_AsLong($result);
-+  //nn = (int)PyLong_AsLong($result);
-   nn = result;
-   $result = PyList_New(nn);
-   for (i = 0; i < nn; i++) {
-      PyObject *o = PyInt_FromLong($1[i]);
-+      PyObject *o = PyLong_FromLong($1[i]);
-       PyList_SetItem($result, i, o);
-   }
- }
-@@ -1012,7 +1012,7 @@ long quadfile_addr(index_t* ind);
-   N = il_size($1);
-   $result = PyList_New(N);
-   for (i = 0; i < N; i++) {
-      PyObject *o = PyInt_FromLong(il_get($1, i));
-+      PyObject *o = PyLong_FromLong(il_get($1, i));
-       PyList_SetItem($result, i, o);
-   }
- }
-@@ -2290,7 +2290,7 @@ static PyObject* anwcs_xy2rd_wrapper(con
-             d = *(double*)PyArray_DATA((PyArrayObject*)py);
-             py = PyFloat_FromDouble(d);
-             i = *(int*)PyArray_DATA((PyArrayObject*)pok);
-            pok = PyInt_FromLong(i);
-+            pok = PyLong_FromLong(i);
-             ret = Py_BuildValue("(NNN)", pok, px, py);
-         } else {
-             // Grab the results -- note "4,2,3" order -- ok,x,y
--- a/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch
+++ b/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch
@ -1,16 +1,7 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 1 Dec 2016 21:18:56 +0100
-Subject: Add SONAME to libastrometry.so
-
---
- solver/Makefile | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/solver/Makefile b/solver/Makefile
-index a82a7bd..a65f728 100644
--- a/solver/Makefile
-+++ b/solver/Makefile
-@@ -136,7 +136,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
+diff -Naur astrometry/blind/Makefile astrometry.new/blind/Makefile
+--- astrometry/blind/Makefile	2017-11-17 23:41:01.749922420 +0100
+++ astrometry.new/blind/Makefile	2017-11-17 23:44:09.742825751 +0100
+@@ -147,7 +147,8 @@
 	$(RANLIB) $@
 
 $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
@ -19,8 +10,8 @@ index a82a7bd..a65f728 100644
 +	ln -s  $@.0 $@
 
 # old and miscellaneous executables that aren't part of the pipeline.
- OLDEXECS := checkquads
-@@ -212,8 +213,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB)
+ OLDEXECS := plotquads rawstartree checkquads
+@@ -232,8 +233,8 @@
 	done
 	$(MKDIR) '$(LIB_INSTALL_DIR)'
 	@for x in $(INSTALL_LIB); do \
--- a/astrometry-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch
+++ b/astrometry-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch
@ -0,0 +1,59 @@
+diff -Naur astrometry/catalogs/Makefile astrometry.new/catalogs/Makefile
+--- astrometry/catalogs/Makefile	2017-11-18 00:03:49.624856663 +0100
+++ astrometry.new/catalogs/Makefile	2017-11-18 00:04:11.932208704 +0100
+@@ -22,11 +22,11 @@
+ 
+ ngc2000.o: ngc2000.c ngc2000names.c ngc2000entries.c
+ 
+-ngc2000names.c: parse-ngc2000names.awk $(DATA)/ngc2000names.dat
+-	$(AWK) -f parse-ngc2000names.awk < $(DATA)/ngc2000names.dat  > $@
+ngc2000names.c: parse-ngc2000names.awk
+	$(AWK) -f parse-ngc2000names.awk < /dev/null  > $@
+ 
+-ngc2000entries.py: parse-ngc2000-py.awk $(DATA)/ngc2000.dat
+-	$(AWK) -f parse-ngc2000-py.awk < $(DATA)/ngc2000.dat  > $@
+ngc2000entries.py: parse-ngc2000-py.awk
+	$(AWK) -f parse-ngc2000-py.awk < /dev/null  > $@
+ 
+ ngc2000accurate.py: parse-ngcic-accurate-py.awk $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt
+ 	cat $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt | $(AWK) -f parse-ngcic-accurate-py.awk > $@
+@@ -34,8 +34,8 @@
+ ngc2000.py: ngc2000-pre.py ngc2000entries.py ngc2000-mid.py ngc2000accurate.py ngc2000-post.py
+ 	cat $^ > $@
+ 
+-ngc2000entries.c: parse-ngc2000.awk $(DATA)/ngc2000.dat
+-	$(AWK) -f parse-ngc2000.awk < $(DATA)/ngc2000.dat  > $@
+ngc2000entries.c: parse-ngc2000.awk
+	$(AWK) -f parse-ngc2000.awk < /dev/null  > $@
+ 
+ ngcic-accurate-entries.c: parse-ngcic-accurate.awk $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt
+ 	cat $(DATA)/ngc2000_pos.txt $(DATA)/ic2000_pos.txt | $(AWK) -f parse-ngcic-accurate.awk > $@
+@@ -60,8 +60,6 @@
+ 
+ HEADERS_PATH := $(addprefix $(INCLUDE_DIR)/,$(HEADERS))
+ 
+-PYTHON_INSTALL := __init__.py ngc2000.py 
+-
+ PY_INSTALL_DIR := $(PY_BASE_INSTALL_DIR)/catalogs
+ LINK_DIR := $(PY_BASE_LINK_DIR)/catalogs
+ 
+diff -Naur astrometry/Makefile astrometry.new/Makefile
+--- astrometry/Makefile	2017-11-18 00:03:49.631856774 +0100
+++ astrometry.new/Makefile	2017-11-18 00:04:26.394436938 +0100
+@@ -130,7 +130,6 @@
+ 	$(MKDIR) '$(MAN1_INSTALL_DIR)'
+ 	$(CP) __init__.py '$(PY_BASE_INSTALL_DIR)'
+ 	$(CP) CREDITS LICENSE README.md report.txt '$(DOC_INSTALL_DIR)'
+-	$(CP) demo/* '$(EXAMPLE_INSTALL_DIR)'
+ 	$(CP) man/*.1 '$(MAN1_INSTALL_DIR)'
+ 	$(MAKE) -C util  install-core
+ 	$(MAKE) -C catalogs install
+@@ -301,8 +300,6 @@
+ 	$(MAKE) -C catalogs clean
+ 	-$(MAKE) -C qfits-an clean
+ 	-rm __init__.pyc
+-	$(MAKE) -C gsl-an clean
+-	-rm gsl-an/config.h
+ 	$(MAKE) -C libkd clean
+ 	$(MAKE) -C blind clean
+ 	$(MAKE) -C sdss clean
--- a/astrometry-Call-python-scripts-as-modules-instead-of-executables.patch
+++ b/astrometry-Call-python-scripts-as-modules-instead-of-executables.patch
@ -0,0 +1,62 @@
+From: Ole Streicher <olebole@debian.org>
+Date: Thu, 1 Dec 2016 21:18:56 +0100
+Subject: Call python scripts as modules instead of executables
+
+In Debian, the python scripts are not installed in /usr/bin, but are
+only accessible as modules. Therefore, we need to replace the direct
+call of the script by "python -m astrometry.$(MODULE)".
+---
+ blind/augment-xylist.c | 12 +++++++++---
+ util/image2pnm.py      |  2 +-
+ 2 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/blind/augment-xylist.c b/blind/augment-xylist.c
+index 31bdd22..da0ea05 100644
+--- a/blind/augment-xylist.c
+++ b/blind/augment-xylist.c
+@@ -723,7 +723,9 @@ int augment_xylist(augment_xylist_t* axy,
+                 sl_append_nocopy(tempfiles, pnmfn);
+             }
+ 
+-            append_executable(cmd, "image2pnm", me);
+	    append_executable(cmd, "python3", me);
+	    sl_append(cmd, "-m");
+	    sl_append(cmd, "astrometry.util.image2pnm");
+             if (axy->extension) {
+                 sl_append(cmd, "--extension");
+                 sl_appendf(cmd, "%i", axy->extension);
+@@ -1051,7 +1053,9 @@ int augment_xylist(augment_xylist_t* axy,
+         }
+         logverb("Removing lines of (spurious) sources from xylist \"%s\", writing to \"%s\"\n",
+                 xylsfn, nolinesfn);
+-        append_executable(cmd, "removelines", me);
+	append_executable(cmd, "python3", me);
+	sl_append(cmd, "-m");
+	sl_append(cmd, "astrometry.util.removelines");
+         if (axy->xcol)
+             sl_appendf(cmd, "-X %s", axy->xcol);
+         if (axy->ycol)
+@@ -1110,7 +1114,9 @@ int augment_xylist(augment_xylist_t* axy,
+             unixylsfn = create_temp_file("uniform", axy->tempdir);
+             sl_append_nocopy(tempfiles, unixylsfn);
+         }
+-        append_executable(cmd, "uniformize", me);
+	append_executable(cmd, "python3", me);
+	sl_append(cmd, "-m");
+	sl_append(cmd, "astrometry.util.uniformize");
+         sl_appendf(cmd, "-n %i", axy->uniformize);
+         if (axy->xcol)
+             sl_appendf(cmd, "-X %s", axy->xcol);
+diff --git a/util/image2pnm.py b/util/image2pnm.py
+index de7e546..ee88efe 100755
+--- a/util/image2pnm.py
+++ b/util/image2pnm.py
+@@ -165,7 +165,7 @@ def image2pnm(infile, outfile, force_ppm=False, extension=None, mydir=None):
+     if ext == fitsext and extension:
+         cmd = an_fitstopnm_ext_cmd % extension
+ 
+-    if ext == fitsext and mydir:
+    if False and ext == fitsext and mydir:
+         # an-fitstopnm: add explicit path...
+         cmd = find_program(mydir, cmd)
+         if cmd is None:
--- a/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch
+++ b/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch
@ -3,30 +3,16 @@ Date: Thu, 1 Dec 2016 21:18:56 +0100
 Subject: Dynamically link to libastrometry.so, when possible

 ---
- libkd/Makefile  |  3 +--
- solver/Makefile | 10 ++++------
- util/Makefile   |  9 +++------
- 3 files changed, 8 insertions(+), 14 deletions(-)
+ blind/Makefile | 10 ++++------
+ libkd/Makefile |  3 +--
+ util/Makefile  |  8 +++-----
+ 3 files changed, 8 insertions(+), 13 deletions(-)

-diff --git a/libkd/Makefile b/libkd/Makefile
-index 3a43d44..416ff9a 100644
--- a/libkd/Makefile
-+++ b/libkd/Makefile
-@@ -92,8 +92,7 @@ py: pyspherematch
- PYSPHEREMATCH_OBJ := pyspherematch.o
- 
- spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
-	LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
-	SLIB="$(SLIB)" \
-+	LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
- 	INC="$(INC)" \
- 	CFLAGS="$(CFLAGS)" \
- 	$(PYTHON) setup.py build_ext --inplace --force --build-temp .
-diff --git a/solver/Makefile b/solver/Makefile
-index a65f728..343d38e 100644
--- a/solver/Makefile
-+++ b/solver/Makefile
-@@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF)
+diff --git a/blind/Makefile b/blind/Makefile
+index 5ce0c89..66fdc54 100644
+--- a/blind/Makefile
+++ b/blind/Makefile
+@@ -43,9 +43,7 @@ LDFLAGS := $(LDFLAGS_DEF)
 LDLIBS := $(LDLIBS_DEF)
 LDLIBS += $(ANFILES_LIB)
 
@ -35,9 +21,9 @@ index a65f728..343d38e 100644
 -SLIB += $(ANFILES_SLIB)
 +SLIB := $(ENGINE_SO)
 
- CFLAGS += $(CFLAGS_DEF)
- CFLAGS += $(CATS_INC)
-@@ -124,7 +122,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
+ CAIRO_SLIB := $(COMMON)/cairoutils.o
+ CAIRO_SLIB += $(SLIB)
+@@ -130,7 +128,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \
 	resort-xylist.o
 
 BUILD_INDEX_OBJS := build-index.o uniformize-catalog.o startree.o hpquads.o \
@ -46,7 +32,7 @@ index a65f728..343d38e 100644
 	unpermute-quads.o merge-index.o 
 ENGINE_OBJS += $(BUILD_INDEX_OBJS)
 
-@@ -135,8 +133,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
+@@ -146,8 +144,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
 	$(AR) rc $@ $(ENGINE_OBJS)
 	$(RANLIB) $@
 
@ -57,12 +43,26 @@ index a65f728..343d38e 100644
 	ln -s  $@.0 $@
 
 # old and miscellaneous executables that aren't part of the pipeline.
+diff --git a/libkd/Makefile b/libkd/Makefile
+index f535986..0442518 100644
+--- a/libkd/Makefile
+++ b/libkd/Makefile
+@@ -90,8 +90,7 @@ py: pyspherematch
+ PYSPHEREMATCH_OBJ := pyspherematch.o
+ 
+ spherematch_c$(PYTHON_SO_EXT): pyspherematch.c setup.py $(SLIB)
+-	LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" \
+-	SLIB="$(SLIB)" \
+	LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
+ 	INC="$(INC)" \
+ 	CFLAGS="$(CFLAGS)" \
+ 	$(PYTHON) setup.py build_ext --inplace --force --build-temp .
 diff --git a/util/Makefile b/util/Makefile
-index e5700ba..c125022 100644
+index b00f71f..84507bb 100644
 --- a/util/Makefile
 +++ b/util/Makefile
-@@ -57,8 +57,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \
- 	tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o
+@@ -50,8 +50,7 @@ ANFILES_OBJ += multiindex.o index.o codekd.o starkd.o rdlist.o xylist.o \
+ 	tabsort.o wcs-xy2rd.o wcs-rd2xy.o
 ANFILES_DEPS += $(QFITS_LIB)
 
 -ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \
@ -71,23 +71,22 @@ index e5700ba..c125022 100644
 ANUTILS_DEPS += $(QFITS_LIB)
 endif
 
-@@ -105,9 +104,7 @@ CFLAGS += -I.
+@@ -96,8 +95,7 @@ CFLAGS += -I.
 
 LDFLAGS += $(LDFLAGS_DEF)
 
 -LDLIBS := $(LDLIBS_DEF)
 -LDLIBS += $(ANFILES_LIB)
-LDLIBS += $(ANUTILS_LIB)
 +LDLIBS := $(LDLIBS_DEF) -lm
 
 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
 
-@@ -171,7 +168,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB)
+@@ -161,7 +159,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB)
 ALL_OBJ += an-pnmtofits.o
 
 _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB)
 -	LDFLAGS="$(LDFLAGS)" LDLIBS="$(LDLIBS)" SLIB="$(ANFILES_SLIB)" \
-+	LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \
+	LDFLAGS="$(LDFLAGS)" LDLIBS="-L../blind -lastrometry" \
 	INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \
 	$(PYTHON) setup.py build_ext -v --inplace --build-temp .
 util.py: util.i lanczos.i
--- a/astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
+++ b/astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
@ -8,10 +8,10 @@ Subject: Fix issues when using Debian libs instead of convienience copies
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/util/Makefile b/util/Makefile
-index 9253faa..95835a1 100644
+index 0ecf716..f154f6f 100644
 --- a/util/Makefile
 +++ b/util/Makefile
-@@ -101,7 +101,7 @@ CFLAGS += -I.
+@@ -86,7 +86,7 @@ CFLAGS += -I.
 
 LDFLAGS += $(LDFLAGS_DEF)
 
@ -21,7 +21,7 @@ index 9253faa..95835a1 100644
 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF)
 
 diff --git a/util/makefile.gsl b/util/makefile.gsl
-index 5bb6920..59a5529 100644
+index cb7831f..5c137c6 100644
 --- a/util/makefile.gsl
 +++ b/util/makefile.gsl
@@ -2,7 +2,7 @@
--- a/astrometry-generate-tarball.sh
+++ b/astrometry-generate-tarball.sh
@ -8,6 +8,12 @@ tar -xzvf astrometry.net-$VERSION.tar.gz
 unlink astrometry.net-$VERSION/astrometry
 rm -rf astrometry.net-$VERSION/demo
 rm -rf astrometry.net-$VERSION/gsl-an
+rm -f astrometry.net-$VERSION/catalogs/ic2000.fits
+rm -f astrometry.net-$VERSION/catalogs/ngc2000-readme.txt
+rm -f astrometry.net-$VERSION/catalogs/ngc2000.dat
+rm -f astrometry.net-$VERSION/catalogs/ngc2000.fits
+rm -f astrometry.net-$VERSION/catalogs/ngc2000names.dat
+rm -f astrometry.net-$VERSION/catalogs/ngc2000names.fits

 tar -cJvf astrometry.net-$VERSION-clean.tar.xz astrometry.net-$VERSION 

--- a/astrometry-get-data.sh
+++ b/astrometry-get-data.sh
@ -1,39 +1,78 @@
 #!/bin/sh

 set -e
+export XZ_OPT=-9

-# 41xx series - 2000 to 22 arcmin
-mkdir -p astrometry-data-4107-4119
-cd astrometry-data-4107-4119
-for ((i=7; i<=19; i++)); do
-        I=$(printf %02i $i)
-        wget -c http://data.astrometry.net/4100/index-41$I.fits
+# 4204 series
+mkdir -p astrometry-data-4204
+cd astrometry-data-4204
+wget -c http://data.astrometry.net/4200/LICENSE
+for i in `seq -w 0 9` ; do
+	wget -c http://data.astrometry.net/4200/index-4204-0${i}.fits
+done
+for i in `seq -w 10 47` ; do
+        wget -c http://data.astrometry.net/4200/index-4204-${i}.fits
 done
 cd ..
-tar -I 'zstd -9' -cf astrometry-data-4107-4119.tar.zst astrometry-data-4107-4119
+#tar -cJf astrometry-data-4204.tar.xz astrometry-data-4204

-# 5206 series - 16 to 22 arcmin
-mkdir -p astrometry-data-5206
-cd astrometry-data-5206
-for ((i=0; i<=47; i++)); do
-        I=$(printf %02i $i)
-        wget -c https://portal.nersc.gov/project/cosmo/temp/dstn/index-5200/LITE/index-5206-$I.fits
+# 4205 series
+mkdir -p astrometry-data-4205
+cd astrometry-data-4205
+wget -c http://data.astrometry.net/4200/LICENSE
+for i in `seq -w 0 9` ; do
+        wget -c http://data.astrometry.net/4200/index-4205-0${i}.fits
+done
+for i in `seq -w 10 11` ; do
+        wget -c http://data.astrometry.net/4200/index-4205-${i}.fits
 done
 cd ..
-tar -I 'zstd -9' -cf astrometry-data-5206.tar.zst astrometry-data-5206
+#tar -cJf astrometry-data-4205.tar.xz astrometry-data-4205

-# 5205 series - 11 to 16 arcmin
-mkdir -p astrometry-data-5205
-cd astrometry-data-5205
-for ((i=0; i<=47; i++)); do
-        I=$(printf %02i $i)
-        wget -c https://portal.nersc.gov/project/cosmo/temp/dstn/index-5200/LITE/index-5205-$I.fits
+# 4206 series
+mkdir -p astrometry-data-4206
+cd astrometry-data-4206
+wget -c http://data.astrometry.net/4200/LICENSE
+for i in `seq -w 0 9` ; do
+        wget -c http://data.astrometry.net/4200/index-4206-0${i}.fits
+done
+for i in `seq -w 10 11` ; do
+        wget -c http://data.astrometry.net/4200/index-4206-${i}.fits
 done
 cd ..
-tar -I 'zstd -9' -cf astrometry-data-5205.tar.zst astrometry-data-5205
+#tar -cJf astrometry-data-4206.tar.xz astrometry-data-4206

+# 4207 series
+mkdir -p astrometry-data-4207
+cd astrometry-data-4207
+wget -c http://data.astrometry.net/4200/LICENSE
+for i in `seq -w 0 9` ; do
+        wget -c http://data.astrometry.net/4200/index-4207-0${i}.fits
+done
+for i in `seq -w 10 11` ; do
+        wget -c http://data.astrometry.net/4200/index-4207-${i}.fits
+done
+cd ..
+#tar -cJf astrometry-data-4207.tar.xz astrometry-data-4207
+
+# 4208 - 4219 series in data subpackage
+mkdir -p astrometry-data-4208-4219
+cd astrometry-data-4208-4219
+wget -c http://data.astrometry.net/4200/LICENSE
+for i in `seq -w 8 9` ; do
+        wget -c http://data.astrometry.net/4200/index-420${i}.fits
+done
+for i in `seq -w 10 19` ; do
+        wget -c http://data.astrometry.net/4200/index-42${i}.fits
+done
+cd ..
+tar -cJf astrometry-data-4208-4219.tar.xz astrometry-data-4208-4219

 #Clean up
-rm -rf astrometry-data-4107-4119
-rm -rf astrometry-data-5206
-rm -rf astrometry-data-5205
+rm -rf astrometry-data-4204
+rm -rf astrometry-data-4205
+rm -rf astrometry-data-4206
+rm -rf astrometry-data-4207
+rm -rf astrometry-data-4208-4219
+
+
--- a/astrometry.spec
+++ b/astrometry.spec
@ -1,14 +1,11 @@
-# Parallel make flags on break build
-%global _smp_build_ncpus 1
-
-# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
-# astropy is not available anymore on i686
-ExcludeArch:    %{ix86}
+# Bootstrap option, we have to build astrometry before we can generate index
+# files, but later package will require them for tests at build time
+%global bootstrap 1


 Name:           astrometry
-Version:        0.98
-Release:        %autorelease
+Version:        0.78
+Release:        8%{?dist}
 Summary:        Blind astrometric calibration of arbitrary astronomical images

 # Software is BSD with some GPL code
@ -21,60 +18,60 @@ Summary:        Blind astrometric calibration of arbitrary astronomical images
 #
 # See also: file CREDITS in source folder
 #
-# General license for astrometry and libkd code: 3-clause BSD
+# General license for astrometry code: 3-clause BSD
 #
 # GPLv2+:
 #    qfits-an/*
 #    include/astrometry/qfits*
 #    catalogs/ucac4-fits.h
+#    libkd/an-fls.h
 #    util/makefile.jpeg
 #    util/md5.c
 #    Makefile
 #    doc/UCAC3_guide/* (not used for build and not shipped)
 #    doc/UCAC4_guide/* (not used for build and not shipped)
 #    
-#    .fits data files
+#    2MASS data files index-42xx.fits
 #
 # GPLv3+:
 #    blind/an_mm_malloc.h
 #    util/ctmf.c
 #
-License:        BSD-3-Clause and GPL-2.0-or-later and GPL-3.0-or-later
+License:        BSD and GPLv2+ and GPLv3+
 URL:            http://www.astrometry.net

 # Upstream sources contains nonfree stuff so we must clean them
 # Download original sources from:
-# Source0:        https://github.com/dstndstn/%%{name}.net/releases/download/%%{version}/%%{name}.net-%%{version}.tar.gz
+# Source0:        http://astrometry.net/downloads/%%{name}.net-%%{version}.tar.gz
 # Then use the provided script to clean them with
-# ./astrometry-generate-tarball %%{version}
+# ./generate-tarball %%{version}
 Source0:        %{name}.net-%{version}-clean.tar.xz
 Source1:        %{name}-generate-tarball.sh

-# data files, ./astrometry-get-data.sh
-Source2:        astrometry-data-4107-4119.tar.zst
-Source3:        astrometry-data-5206.tar.zst
-Source4:        astrometry-data-5205.tar.zst
-Source5:        astrometry-get-data.sh
+# 2MASS data files, ./astrometry-get-data.sh
+Source2:        astrometry-data-4204.tar.xz
+Source3:        astrometry-data-4205.tar.xz
+Source4:        astrometry-data-4206.tar.xz
+Source5:        astrometry-data-4207.tar.xz
+Source6:        astrometry-data-4208-4219.tar.xz
+Source7:        astrometry-get-data.sh

-# Patches from Ole Streicher <olebole@debian.org> used on Debian
-Patch:          Add-SONAME-to-libastrometry.so.patch
-Patch:          Dynamically-link-to-libastrometry.so-when-possible.patch
-Patch:          Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
-Patch:          Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch
-Patch:          Don-t-copy-demo-files-to-examples.patch
-Patch:          Remove-errornous-generation-of-net-client.py.patch
-Patch:          Remove-horizons.py-from-Python-package.patch
-# Replace removed Python 2 C API macros with Python 3 equivalents
-# for compatibility with SWIG 4.5.0
-Patch:          Replace-removed-Python-2-C-API-macros-for-SWIG-4.5.0.patch
+# Patches from Ole Streicher <olebole@debian.org> used on Debian to
+#  * disable build of nonfree stuff removed from sources
+#  * have a proper versioned soname
+#  * use system libraries properly
+#  * use dynamical linking
+Patch0:         %{name}-0.73-Add-SONAME-to-libastrometry.so.patch
+Patch1:         %{name}-Dynamically-link-to-libastrometry.so-when-possible.patch
+Patch2:         %{name}-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
+Patch3:         %{name}-Call-python-scripts-as-modules-instead-of-executables.patch
+Patch4:         %{name}-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch

 BuildRequires:  gcc
-BuildRequires:  make
 BuildRequires:  netpbm-devel
 BuildRequires:  python3-numpy
 BuildRequires:  python3-astropy
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  swig
 BuildRequires:  xorg-x11-proto-devel

@ -89,18 +86,24 @@ BuildRequires:  pkgconfig(wcslib)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(zlib)

+%if ! 0%{?bootstrap}
+BuildRequires:  astrometry-tycho2
+%endif
+
+Requires:       %{name}-data = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       netpbm-progs
 Requires:       python3-%{name} = %{version}-%{release}

-Recommends:     cfitsio-utils
 # User could use own set of index files or another set from upstream.
-# Therefore we recommend and not require index-files from Fedora repos.
-Recommends:     %{name}-data-4107-4119 = %{version}-%{release}
-
-Provides:       bundled(libkd)
-Provides:       bundled(qfits)
+# Therefore we suggest and not require astrometry-tycho2 here
+Suggests:     astrometry-tycho2

+# FIXME
+# Kill s390x build for now, s390x build seems unknown
+# "cpio: read failed - Inappropriate ioctl for device" error
+# when unpacking srpm
+ExcludeArch:	s390x

 %description
 The astrometry engine will take any image and return the astrometry
@ -108,56 +111,63 @@ world coordinate system (WCS), a standards-based description of the
 transformation between image coordinates and sky coordinates.

 Other tools included in the astrometry package can do much more, like
-plotting astronomic information over solved images, conversion utilities
+plotting astronomic information over solved images, convertion utilities
 or generate statistics from FITS images.


-%package data-4107-4119
-Summary:        Index files for astrometry (scale 7-19, wide-field)
-License:        GPL-2.0-or-later
+%package data
+Summary:        2MASS catalog index files for astrometry (4208-4129, wide-field)
+License:        GPLv2+
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-data-4208-4219 = %{version}-%{release}
+
+%description data
+2MASS index files 4208-4219 (wide-field, 30-2000 arcminutes) for astrometry.
+
+
+%package data-4204
+Summary:        2MASS catalog index files (4204 series) for astrometry
+License:        GPLv2+
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Enhances:       %{name}
-Obsoletes:      %{name}-data <= %{version}-%{release}
-Provides:       %{name}-data = %{version}-%{release}
-Obsoletes:      %{name}-data-4207 <= %{version}-%{release}
-Provides:       %{name}-data-4207 = %{version}-%{release}
-Obsoletes:      %{name}-tycho2 <= 2.0-18
-Provides:       %{name}-tycho2 = 2.0-18

-%description data-4107-4119
-Index files for astrometry built from the Tycho-2 catalog
-(scales 7-19, wide-field, from 22 to 2000 arcminutes).
+%description data-4204
+2MASS index files (4204 series) with 8-11 arcminutes skymarks for astrometry.


-%package data-5206
-Summary:        Index files for astrometry (scale 6, 16 to 22 arcmin)
-License:        GPL-2.0-or-later
+%package data-4205
+Summary:        2MASS catalog index files (4205 series) for astrometry
+License:        GPLv2+
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Enhances:       %{name}
-Obsoletes:      %{name}-data-4206 <= %{version}-%{release}
-Provides:       %{name}-data-4206 = %{version}-%{release}

-%description data-5206
-Index files for astrometry built from Tycho-2 + Gaia-DR2 catalogs, light
-version (no additional Gaia-DR2 information tagged along).
-These indexes are suitable for images from 16 to 22 arcminutes.
+%description data-4205
+2MASS index files (4205 series) with 11-16 arcminutes skymarks for astrometry.


-%package data-5205
-Summary:        Index files for astrometry (scale 5, 11 to 16 arcmin)
-License:        GPL-2.0-or-later
+%package data-4206
+Summary:        2MASS catalog index files (4206 series) for astrometry
+License:        GPLv2+
 BuildArch:      noarch
 Requires:       %{name} = %{version}-%{release}
 Enhances:       %{name}
-Obsoletes:      %{name}-data-4205 <= %{version}-%{release}
-Provides:       %{name}-data-4205 = %{version}-%{release}

-%description data-5205
-Index files for astrometry built from Tycho-2 + Gaia-DR2 catalogs, light
-version (no additional Gaia-DR2 information tagged along).
-These indexes are suitable for images from 11 to 16 arcminutes.
+%description data-4206
+2MASS index files (4206 series) with 16-22 arcminutes skymarks for astrometry.
+
+
+%package data-4207
+Summary:        2MASS catalog index files (4207 series) for astrometry
+License:        GPLv2+
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+Enhances:       %{name}
+
+%description data-4207
+2MASS index files (4207 series) with 22-30 arcminutes skymarks for astrometry.


 %package devel
@ -167,17 +177,19 @@ Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}

-
 %package libs
 Summary:        Libraries for %{name}

 %description libs
 Libraries for %{name}

-
 %package -n python3-%{name}
 Summary:        Python modules from %{name}
 Requires:       python3-astropy
+Provides:       %{name}-python2 = %{version}-%{release}
+Obsoletes:      %{name}-python2 < %{version}-%{release}
+Provides:       python2-%{name} = %{version}-%{release}
+Obsoletes:      python2-%{name} < %{version}-%{release}

 %description -n python3-%{name}
 %{summary}
@ -188,131 +200,118 @@ Requires:       python3-astropy
 %setup -T -D -a 2 -n %{name}.net-%{version}
 %setup -T -D -a 3 -n %{name}.net-%{version}
 %setup -T -D -a 4 -n %{name}.net-%{version}
+%setup -T -D -a 5 -n %{name}.net-%{version}
+%setup -T -D -a 6 -n %{name}.net-%{version}
+
+# Fix Wrong FSF address - reported upstream
+# https://groups.google.com/forum/#!topic/astrometry/mCuyze3TOeM
+grep -rl '59 Temple Place, Suite 330, Boston, MA  02111-1307  USA' * | xargs -i@ sed -i 's/59 Temple Place, Suite 330, Boston, MA  02111-1307  USA/51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA./g' @


 %build
 # Weird symlink required... (also in upstream git)
 ln -sf . astrometry

+# Astrometry doesn't automatically find netpbm
+export NETPBM_INC=-I%{_includedir}/netpbm
+export NETPBM_LIB="-L%{_libdir} -lnetpbm"
+
+# Apply mandatory ld flags
+export LDFLAGS="%__global_ldflags"
+
+# We use Python3 here
+export PYTHON=%{__python3}
 # Parallel make flags on break build
-%make_build \
-    SYSTEM_GSL=yes \
-    NETPBM_INC=-I%{_includedir}/netpbm \
-    NETPBM_LIB="-L%{_libdir} -lnetpbm" \
-    all py extra
+make SYSTEM_GSL=yes all py extra ARCH_FLAGS="%{optflags}"


 %install
-%make_install SYSTEM_GSL=yes \
-              INSTALL_DIR=%{buildroot}%{_prefix} \
-              PY_BASE_INSTALL_DIR=%{buildroot}%{python3_sitearch}/%{name} \
-              INCLUDE_INSTALL_DIR=%{buildroot}%{_includedir}/%{name} \
-              LIB_INSTALL_DIR=%{buildroot}%{_libdir} \
-              BIN_INSTALL_DIR=%{buildroot}%{_bindir} \
-              DATA_INSTALL_DIR=%{buildroot}%{_datadir}/%{name}/data \
-              PY_BASE_LINK_DIR=%{python3_sitearch}/%{name} \
-              ETC_INSTALL_DIR=%{buildroot}%{_sysconfdir} \
-              MAN1_INSTALL_DIR=%{buildroot}%{_mandir}/man1 \
-              DOC_INSTALL_DIR=%{buildroot}%{_docdir}/%{name} \
-              EXAMPLE_INSTALL_DIR=%{buildroot}%{_datadir}/%{name}/examples
+export PYTHON=%{__python3}
+%{make_install} SYSTEM_GSL=yes \
+                INSTALL_DIR=%{buildroot}%{_prefix} \
+                PY_BASE_INSTALL_DIR=%{buildroot}%{python3_sitearch}/%{name} \
+                INCLUDE_INSTALL_DIR=%{buildroot}%{_includedir}/%{name} \
+                LIB_INSTALL_DIR=%{buildroot}%{_libdir} \
+                BIN_INSTALL_DIR=%{buildroot}%{_bindir} \
+                DATA_INSTALL_DIR=%{buildroot}%{_datadir}/%{name}/data \
+                PY_BASE_LINK_DIR=%{python3_sitearch}/%{name} \
+                ETC_INSTALL_DIR=%{buildroot}%{_sysconfdir} \
+                MAN1_INSTALL_DIR=%{buildroot}%{_mandir}/man1 \
+                DOC_INSTALL_DIR=%{buildroot}%{_docdir}/%{name} \
+                EXAMPLE_INSTALL_DIR=%{buildroot}%{_datadir}/%{name}/examples

 # We need to correct the data dir link in config file
 sed -i \
    "s:%{buildroot}%{_prefix}/data:%{_datadir}/%{name}/data:" \
    %{buildroot}/etc/astrometry.cfg

-# Rename executables taken from cfitsio code
+# Rename generic named executables with known conflict
 pushd %{buildroot}%{_bindir}
-for exec in imarith imstat listhead liststruc modhead tabmerge tablist; do
+for exec in tabmerge tablist; do
        mv $exec astrometry-$exec
 done
 popd

-# Fix python shebangs
-%py3_shebang_fix %{buildroot}%{_bindir}/degtohms \
-                 %{buildroot}%{_bindir}/hmstodeg \
-                 %{buildroot}%{_bindir}/image2pnm \
-                 %{buildroot}%{_bindir}/merge-columns \
-                 %{buildroot}%{_bindir}/removelines \
-                 %{buildroot}%{_bindir}/text2fits \
-                 %{buildroot}%{_bindir}/uniformize \
-                 %{buildroot}%{_bindir}/votabletofits
-
 # Remove unuseful file
 rm -f %{buildroot}%{_docdir}/%{name}/report.txt

 # We don't ship static libraries so we remove them
 rm -f %{buildroot}%{_libdir}/*.a

-# Remove symlink in bin to python script
-rm -f %{buildroot}%{_bindir}/plotann.py
+# Fix wrong python interpreter
+pushd %{buildroot}%{_bindir}
+for exec in degtohms image2pnm removelines text2fits hmstodeg votabletofits uniformize merge-columns; do
+        sed -i "s,/usr/bin/env python,%{__python3},g" $exec
+done
+popd
+find %{buildroot}/%{python3_sitearch}/%{name} -name '*.py' | xargs sed -i '1s|^#!.*|#!%{__python3}|'
+
+# LICENSE file is managed by %%license scriptlet
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE

 # Install data files
 install -m0644 astrometry-data*/*.fits %{buildroot}%{_datadir}/%{name}/data

-
 %check
 export PYTHON=%{__python3}
 make test ARCH_FLAGS="%{optflags}"


+%ldconfig_scriptlets libs
+
+
 %files
 %doc CREDITS README.md
-%license %{_docdir}/%{name}/LICENSE
+%license LICENSE
 %{_mandir}/man1/*
-%{_bindir}/an-fitstopnm
-%{_bindir}/an-pnmtofits
-%{_bindir}/astrometry-engine
-%{_bindir}/astrometry-imarith
-%{_bindir}/astrometry-imstat
-%{_bindir}/astrometry-listhead
-%{_bindir}/astrometry-liststruc
-%{_bindir}/astrometry-modhead
-%{_bindir}/astrometry-tabmerge
-%{_bindir}/astrometry-tablist
-%{_bindir}/augment-xylist
-%{_bindir}/build-astrometry-index
-%{_bindir}/downsample-fits
-%{_bindir}/fit-wcs
-%{_bindir}/fits-column-merge
-%{_bindir}/fits-flip-endian
-%{_bindir}/fits-guess-scale
-%{_bindir}/fitsgetext
-%{_bindir}/get-healpix
-%{_bindir}/get-wcs
-%{_bindir}/hpsplit
-%{_bindir}/image2xy
-%{_bindir}/new-wcs
-%{_bindir}/pad-file
-%{_bindir}/plot-constellations
-%{_bindir}/plotquad
-%{_bindir}/plotxy
-%{_bindir}/query-starkd
-%{_bindir}/solve-field
-%{_bindir}/startree
-%{_bindir}/subtable
-%{_bindir}/tabsort
-%{_bindir}/wcs-grab
-%{_bindir}/wcs-match
-%{_bindir}/wcs-pv2sip
-%{_bindir}/wcs-rd2xy
-%{_bindir}/wcs-resample
-%{_bindir}/wcs-to-tan
-%{_bindir}/wcs-xy2rd
-%{_bindir}/wcsinfo
+%{_bindir}/*
+%exclude %{_bindir}/*.py
 %dir %{_datadir}/astrometry
 %dir %{_datadir}/astrometry/data
 %{_datadir}/astrometry/examples
 %config(noreplace) %{_sysconfdir}/astrometry.cfg

-%files data-4107-4119
-%{_datadir}/astrometry/data/index-41*.fits
+%files data
+%license astrometry-data-4208-4219/LICENSE
+%{_datadir}/astrometry/data/index-4208.fits
+%{_datadir}/astrometry/data/index-4209.fits
+%{_datadir}/astrometry/data/index-421*.fits

-%files data-5206
-%{_datadir}/astrometry/data/index-5206*.fits
+%files data-4204
+%license astrometry-data-4204/LICENSE
+%{_datadir}/astrometry/data/index-4204*.fits

-%files data-5205
-%{_datadir}/astrometry/data/index-5205*.fits
+%files data-4205
+%license astrometry-data-4205/LICENSE
+%{_datadir}/astrometry/data/index-4205*.fits
+
+%files data-4206
+%license astrometry-data-4206/LICENSE
+%{_datadir}/astrometry/data/index-4206*.fits
+
+%files data-4207
+%license astrometry-data-4207/LICENSE
+%{_datadir}/astrometry/data/index-4207*.fits

 %files devel
 %{_includedir}/*
@ -320,18 +319,89 @@ make test ARCH_FLAGS="%{optflags}"

 %files libs
 %license LICENSE
-%{_libdir}/*.so.0*
+%{_libdir}/*.so.*

 %files -n python3-%{name}
-%{python3_sitearch}/%{name}
-%{_bindir}/degtohms
-%{_bindir}/hmstodeg
-%{_bindir}/image2pnm
-%{_bindir}/merge-columns
-%{_bindir}/removelines
-%{_bindir}/text2fits
-%{_bindir}/uniformize
-%{_bindir}/votabletofits
+%{python3_sitearch}/*
+%{_bindir}/*.py

 %changelog
-%autochangelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.78-7
+- Rebuilt for Python 3.9
+
+* Wed Mar 25 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.78-6
+- Rebuild for new wcslib
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.78-5
+- Rebuilt for Python 3.8.0rc1 (#1748018)
+
+* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.78-4
+- Rebuilt for GSL 2.6.
+
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.78-3
+- Rebuilt for Python 3.8
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Apr 28 2019 Christian Dersch <lupinix@mailbox.org> - 0.78-1
+- new version
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.76-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Wed Oct 10 2018 Christian Dersch <lupinix.fedora@gmail.com> - 0.76-1
+- new version
+
+* Mon Jul 16 2018 Christian Dersch <lupinix.fedora@gmail.com> - 0.75-2
+- Dependency fix, require python3-astrometry, not python2-astrometry
+
+* Sat Jul 14 2018 Christian Dersch <lupinix@fedoraproject.org> - 0.75-1
+- new version
+
+* Sat Jul 14 2018 Christian Dersch <lupinix@fedoraproject.org> - 0.74-3
+- Switch to Python 3
+- BuildRequires: gcc
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.74-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 0.74-1
+- new version
+
+* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-5
+- rebuilt for cfitsio 3.450
+
+* Sat Feb 24 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-4
+- rebuilt for cfitsio 3.420 (so version bump)
+
+* Wed Feb 14 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-3
+- rebuilt
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.73-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Nov 17 2017 Christian Dersch <lupinix@mailbox.org> - 0.73-1
+- new version
+
+* Tue Oct 17 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-4
+- Added subpackages for 4204-4207 index files
+
+* Mon Oct 16 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-3
+- Added data subpackage containing the wide-field 2MASS indices
+
+* Mon Sep 25 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-2
+- Move libs to subpackage to be multiarch compatible
+
+* Tue Sep 12 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-1
+- Initial SCM import (#1470436)
+
+* Wed Jul 12 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-0.1
+- initial spec (using the packaging effort from Mattia Verga, RHBZ  #1299139)
+
--- a/153
+++ b/153
@ -1,153 +0,0 @@
-* Sun Aug 04 2024 Mattia Verga <mattia.verga@protonmail.com> - 0.94-10
- Disable build on i686 (fix Fedora#2300567)
- Switch Tycho index files to upstream provided
- Switch 42xx index files to 52xx
-
-* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 0.94-9
- convert license to SPDX
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.94-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 0.94-7
- Rebuilt for Python 3.13
-
-* Mon Jan 29 2024 Mattia Verga <mattia.verga@protonmail.com> - 0.94-6
- Rebuilt for libwcs soname bump
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.94-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Mattia Verga <mattia.verga@protonmail.com> - 0.94-4
- Fix build failure due to removed numpy.distutils and deprecated distutils
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.94-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Jan 10 2024 Mattia Verga <mattia.verga@protonmail.com> - 0.94-2
- Rebuilt for libwcs soname bump
-
-* Sun Sep 17 2023 Mattia Verga <mattia.verga@protonmail.com> - 0.94-1
- Update to 0.94 (fedora#2148995)
- Migrate license to SPDX
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 0.91-4
- Rebuilt for Python 3.12
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.91-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Dec 29 2022 Maxwell G <gotmax@e.email> - 0.91-2
- Rebuild for cfitsio 4.2
-
-* Tue Nov 01 2022 Mattia Verga <mattia.verga@proton.me> - 0.91-1
- Update to 0.91 (fedora#2078037)
-
-* Tue Aug 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.89-4
- Rebuild for gsl-2.7.1
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.89-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 0.89-2
- Rebuilt for Python 3.11
-
-* Sun Feb 06 2022 Mattia Verga <mattia.verga@protonmail.com> - 0.89-1
- Update to 0.89 (fedora#1828169)
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.78-11
- Rebuilt for Python 3.10
-
-* Tue Feb 02 2021 Christian Dersch <lupinix@mailbox.org> - 0.78-10
- Rebuilt for libcfitsio.so.7
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.78-7
- Rebuilt for Python 3.9
-
-* Wed Mar 25 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.78-6
- Rebuild for new wcslib
-
-* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.78-5
- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Tue Aug 20 2019 Susi Lehtola <jussilehtola@fedoraproject.org> - 0.78-4
- Rebuilt for GSL 2.6.
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.78-3
- Rebuilt for Python 3.8
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.78-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Apr 28 2019 Christian Dersch <lupinix@mailbox.org> - 0.78-1
- new version
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.76-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Oct 10 2018 Christian Dersch <lupinix.fedora@gmail.com> - 0.76-1
- new version
-
-* Mon Jul 16 2018 Christian Dersch <lupinix.fedora@gmail.com> - 0.75-2
- Dependency fix, require python3-astrometry, not python2-astrometry
-
-* Sat Jul 14 2018 Christian Dersch <lupinix@fedoraproject.org> - 0.75-1
- new version
-
-* Sat Jul 14 2018 Christian Dersch <lupinix@fedoraproject.org> - 0.74-3
- Switch to Python 3
- BuildRequires: gcc
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.74-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 0.74-1
- new version
-
-* Sat May 26 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-5
- rebuilt for cfitsio 3.450
-
-* Sat Feb 24 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-4
- rebuilt for cfitsio 3.420 (so version bump)
-
-* Wed Feb 14 2018 Christian Dersch <lupinix@mailbox.org> - 0.73-3
- rebuilt
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.73-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Nov 17 2017 Christian Dersch <lupinix@mailbox.org> - 0.73-1
- new version
-
-* Tue Oct 17 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-4
- Added subpackages for 4204-4207 index files
-
-* Mon Oct 16 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-3
- Added data subpackage containing the wide-field 2MASS indices
-
-* Mon Sep 25 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-2
- Move libs to subpackage to be multiarch compatible
-
-* Tue Sep 12 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-1
- Initial SCM import (#1470436)
-
-* Wed Jul 12 2017 Christian Dersch <lupinix@mailbox.org> - 0.72-0.1
- initial spec (using the packaging effort from Mattia Verga, RHBZ  #1299139)
--- a/11
+++ b/11
@ -1,5 +1,6 @@
-SHA512 (astrometry-data-4107-4119.tar.zst) = e240c5e4b53fb8ae16c320d07c538640b9dda0e92e8add56e6b4946d8cd6fd7559239f67b5b02578d8f6d6dacad4d229189308a5422106971b6a4e004e394311
-SHA512 (astrometry-data-5206.tar.zst) = 36194c33fa8856a925bb64fe1abb16c9ba94629c4626ce609fdb6f2e805ef403c596c6d5c492c1d42f29dd402a1e29249da4d2ab170145ba364533d068c97df2
-SHA512 (astrometry-data-5205.tar.zst) = c5648a9e5067573f49ab3e8a598da4b9c8675a312fe45cd77cdb9ff1430389a50dd8e9ad1a1f80f79211e0d88db3b962942f56aa2b94c38618ece583095ec4c2
-SHA512 (astrometry.net-0.97-clean.tar.xz) = ef28fc05a48be2ad7d70cbf430ed989d23a62ae322c30cdf543142164102c64960db33965827963534679c70f6858646ec700962c104b23d795b55fd79618fde
-SHA512 (astrometry.net-0.98-clean.tar.xz) = 2c36640ce4dbdcca8706d0da8e72a3c4ff59aa054c6377a14731956d41320046b77a956132c9bb71e4a1ba1dd1a13d1f3747d6f62d83f9a9be7eca8690f0705a
+SHA512 (astrometry-data-4204.tar.xz) = 23588b5107f392e9d6550f79c026bd1d7e75cb52a873069b39623b54b730297aa3b259649554a33756857dec630e40c1d6d393c466bb978956b81da1f29d6cfb
+SHA512 (astrometry-data-4205.tar.xz) = ec9328e8e8211004ce12f101581d1775c03fa2c4335058dac7a15ebbc0f85c236b8a9e876b3c9ec27ba3df028a0a90a4bb7a5334d2a96dc32c1f93f095ec17a7
+SHA512 (astrometry-data-4206.tar.xz) = 870c3215174a788389f5a560b0c3bc0e1a2ad9bf3017d93f0639ca2872ff84677deb91b480b3dd6ee00adc13aa45e6a268c0155fb39bca2c690d139c8308257e
+SHA512 (astrometry-data-4207.tar.xz) = e67781097bdd05ad5b1188649362327750acb3fd206373ce7c3a6c741d0eac13d53362e89dff355b409d19a40c5274323670780fe66d85a7100d87605ac532ff
+SHA512 (astrometry-data-4208-4219.tar.xz) = 23acc8219b2ccb7a78a5f33a12e796a96a62b062e5293606690de435e2f2b36bb8587895c49ec317db70e108cf9d7a5b34169f99abafe91140880ec21a7d6ff3
+SHA512 (astrometry.net-0.78-clean.tar.xz) = 4afbf8e9441a03fad45fbbca57d5c69849587d42705ff0505f1ae6b5142d7527ec3bc463205820b6695d284cd65f0328f00304656feab940593bce7b1e66e0d2