From 426ca79b6273ad57bd53785950a695fdf91edd38 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 21:06:12 +0000 Subject: [PATCH 01/45] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- astrometry.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/astrometry.spec b/astrometry.spec index 2546a92..2ea06d8 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -85,6 +85,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(wcslib) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) +BuildRequires: make %if ! 0%{?bootstrap} BuildRequires: astrometry-tycho2 From c2d79c92efa976fc5e3950a483c119e8c757306c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:37:59 +0000 Subject: [PATCH 02/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 2ea06d8..f425da4 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.78 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -327,6 +327,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.78-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.78-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 12b552be889e0d8021a99cee8483036bfa553f68 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Tue, 2 Feb 2021 19:26:05 +0100 Subject: [PATCH 03/45] Rebuilt for libcfitsio.so.7 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index f425da4..e1c10e9 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.78 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -327,6 +327,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Tue Feb 02 2021 Christian Dersch - 0.78-10 +- Rebuilt for libcfitsio.so.7 + * Tue Jan 26 2021 Fedora Release Engineering - 0.78-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 18fd1bd0e44dcb6203dd0a75a0987897b4663cff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 19:59:35 +0200 Subject: [PATCH 04/45] Rebuilt for Python 3.10 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index e1c10e9..9af5a49 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.78 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -327,6 +327,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Fri Jun 04 2021 Python Maint - 0.78-11 +- Rebuilt for Python 3.10 + * Tue Feb 02 2021 Christian Dersch - 0.78-10 - Rebuilt for libcfitsio.so.7 From 08e05f69ba285d3d26a12280364136ea2c72b3e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:10:14 +0000 Subject: [PATCH 05/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 2d8a41d509ba09645aa5debb47005b394311479a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:06:14 +0000 Subject: [PATCH 06/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 9af5a49..df06799 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.78 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -327,6 +327,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.78-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 0.78-11 - Rebuilt for Python 3.10 From 7f2e808afd1675c7d75b83b79179838484bb13d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:49:09 +0000 Subject: [PATCH 07/45] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index df06799..c5b053d 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.78 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -327,6 +327,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/*.py %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.78-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.78-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 426655e58b43e401b40c775bc60259e0a3bdc0fd Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 6 Feb 2022 17:19:04 +0100 Subject: [PATCH 08/45] Update to 0.89 --- .gitignore | 1 + ...e-files-images-and-NGC2000.0-catalog.patch | 59 ------------ ...-0.89_Add-SONAME-to-libastrometry.so.patch | 21 +++-- ...89_Don-t-copy-demo-files-to-examples.patch | 20 +++++ ...nk-to-libastrometry.so-when-possible.patch | 64 ++++++------- ...-Debian-libs-instead-of-convienience.patch | 6 +- ...so-that-the-package-can-be-built-on-.patch | 33 +++++++ ...rrornous-generation-of-net-client.py.patch | 26 ++++++ ...ts-as-modules-instead-of-executables.patch | 62 ------------- astrometry-generate-tarball.sh | 6 -- astrometry.spec | 89 +++++++++---------- sources | 2 +- 12 files changed, 175 insertions(+), 214 deletions(-) delete mode 100644 astrometry-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch rename astrometry-0.73-Add-SONAME-to-libastrometry.so.patch => astrometry-0.89_Add-SONAME-to-libastrometry.so.patch (56%) create mode 100644 astrometry-0.89_Don-t-copy-demo-files-to-examples.patch rename astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch => astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch (71%) rename astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch => astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch (90%) create mode 100644 astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch create mode 100644 astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch delete mode 100644 astrometry-Call-python-scripts-as-modules-instead-of-executables.patch diff --git a/.gitignore b/.gitignore index 872c7fb..5a5026f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /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 diff --git 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 deleted file mode 100644 index 79015da..0000000 --- a/astrometry-0.73-Don-t-install-non-free-files-images-and-NGC2000.0-catalog.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 diff --git a/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch b/astrometry-0.89_Add-SONAME-to-libastrometry.so.patch similarity index 56% rename from astrometry-0.73-Add-SONAME-to-libastrometry.so.patch rename to astrometry-0.89_Add-SONAME-to-libastrometry.so.patch index 59dd97d..6a38df2 100644 --- a/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch +++ b/astrometry-0.89_Add-SONAME-to-libastrometry.so.patch @@ -1,7 +1,16 @@ -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 @@ +From: Ole Streicher +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 6870244..08f5e35 100644 +--- a/solver/Makefile ++++ b/solver/Makefile +@@ -134,7 +134,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) $(RANLIB) $@ $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB) @@ -10,8 +19,8 @@ diff -Naur astrometry/blind/Makefile astrometry.new/blind/Makefile + ln -s $@.0 $@ # old and miscellaneous executables that aren't part of the pipeline. - OLDEXECS := plotquads rawstartree checkquads -@@ -232,8 +233,8 @@ + OLDEXECS := checkquads +@@ -205,8 +206,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB) done $(MKDIR) '$(LIB_INSTALL_DIR)' @for x in $(INSTALL_LIB); do \ diff --git a/astrometry-0.89_Don-t-copy-demo-files-to-examples.patch b/astrometry-0.89_Don-t-copy-demo-files-to-examples.patch new file mode 100644 index 0000000..c33af75 --- /dev/null +++ b/astrometry-0.89_Don-t-copy-demo-files-to-examples.patch @@ -0,0 +1,20 @@ +From: Ole Streicher +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 a8878f2..391c2d5 100644 +--- a/Makefile ++++ b/Makefile +@@ -157,7 +157,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 diff --git a/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch b/astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch similarity index 71% rename from astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch rename to astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch index 4c9f8b6..f000c03 100644 --- a/astrometry-Dynamically-link-to-libastrometry.so-when-possible.patch +++ b/astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch @@ -3,16 +3,30 @@ Date: Thu, 1 Dec 2016 21:18:56 +0100 Subject: Dynamically link to libastrometry.so, when possible --- - blind/Makefile | 10 ++++------ - libkd/Makefile | 3 +-- - util/Makefile | 8 +++----- + libkd/Makefile | 3 +-- + solver/Makefile | 10 ++++------ + util/Makefile | 8 +++----- 3 files changed, 8 insertions(+), 13 deletions(-) -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) +diff --git a/libkd/Makefile b/libkd/Makefile +index d8de18e..77c0f3d 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 08f5e35..cdc98cd 100644 +--- a/solver/Makefile ++++ b/solver/Makefile +@@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF) LDLIBS := $(LDLIBS_DEF) LDLIBS += $(ANFILES_LIB) @@ -21,9 +35,9 @@ index 5ce0c89..66fdc54 100644 -SLIB += $(ANFILES_SLIB) +SLIB := $(ENGINE_SO) - CAIRO_SLIB := $(COMMON)/cairoutils.o - CAIRO_SLIB += $(SLIB) -@@ -130,7 +128,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \ + CFLAGS += $(CFLAGS_DEF) + CFLAGS += $(CATS_INC) +@@ -122,7 +120,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 \ @@ -32,7 +46,7 @@ index 5ce0c89..66fdc54 100644 unpermute-quads.o merge-index.o ENGINE_OBJS += $(BUILD_INDEX_OBJS) -@@ -146,8 +144,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) +@@ -133,8 +131,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) $(AR) rc $@ $(ENGINE_OBJS) $(RANLIB) $@ @@ -43,26 +57,12 @@ index 5ce0c89..66fdc54 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 b00f71f..84507bb 100644 +index 1909bf4..db92966 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -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 +@@ -55,8 +55,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \ + tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o ANFILES_DEPS += $(QFITS_LIB) -ANUTILS_OBJ += fitsioutils.o sip_qfits.o fitstable.o fitsbin.o fitsfile.o \ @@ -71,7 +71,7 @@ index b00f71f..84507bb 100644 ANUTILS_DEPS += $(QFITS_LIB) endif -@@ -96,8 +95,7 @@ CFLAGS += -I. +@@ -101,8 +100,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) @@ -81,12 +81,12 @@ index b00f71f..84507bb 100644 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) -@@ -161,7 +159,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) +@@ -166,7 +164,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../blind -lastrometry" \ ++ LDFLAGS="$(LDFLAGS)" LDLIBS="-L../solver -lastrometry" \ INC="$(ANFILES_INC)" CFLAGS="$(CFLAGS)" \ $(PYTHON) setup.py build_ext -v --inplace --build-temp . util.py: util.i lanczos.i diff --git a/astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch b/astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch similarity index 90% rename from astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch rename to astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch index 82f7db3..fcc01f2 100644 --- a/astrometry-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch +++ b/astrometry-0.89_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 0ecf716..f154f6f 100644 +index db92966..dc4562d 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -86,7 +86,7 @@ CFLAGS += -I. +@@ -100,7 +100,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) @@ -21,7 +21,7 @@ index 0ecf716..f154f6f 100644 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) diff --git a/util/makefile.gsl b/util/makefile.gsl -index cb7831f..5c137c6 100644 +index 5bb6920..59a5529 100644 --- a/util/makefile.gsl +++ b/util/makefile.gsl @@ -2,7 +2,7 @@ diff --git a/astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch b/astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch new file mode 100644 index 0000000..3c9f37f --- /dev/null +++ b/astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch @@ -0,0 +1,33 @@ +From: Ole Streicher +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 | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/util/makefile.common b/util/makefile.common +index 76adf8f..35116e1 100644 +--- a/util/makefile.common ++++ b/util/makefile.common +@@ -171,9 +171,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) +@@ -281,7 +280,7 @@ endif + endif + + ifneq (CYGWIN,$(findstring CYGWIN,$(UNAME))) +-FLAGS_DEF += -fpic ++FLAGS_DEF += -fpic -fPIC + endif + + # profily! diff --git a/astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch b/astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch new file mode 100644 index 0000000..e30d4f2 --- /dev/null +++ b/astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch @@ -0,0 +1,26 @@ +From: Ole Streicher +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 aa17acb..add4fd8 100644 +--- a/Makefile ++++ b/Makefile +@@ -165,13 +165,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 + + ifeq ($(SYSTEM_GSL),yes) diff --git a/astrometry-Call-python-scripts-as-modules-instead-of-executables.patch b/astrometry-Call-python-scripts-as-modules-instead-of-executables.patch deleted file mode 100644 index 0b1aca7..0000000 --- a/astrometry-Call-python-scripts-as-modules-instead-of-executables.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Ole Streicher -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: diff --git a/astrometry-generate-tarball.sh b/astrometry-generate-tarball.sh index 2b2ca07..4864592 100755 --- a/astrometry-generate-tarball.sh +++ b/astrometry-generate-tarball.sh @@ -8,12 +8,6 @@ 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 diff --git a/astrometry.spec b/astrometry.spec index c5b053d..4d743ae 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -4,8 +4,8 @@ Name: astrometry -Version: 0.78 -Release: 13%{?dist} +Version: 0.89 +Release: 1%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -24,7 +24,6 @@ Summary: Blind astrometric calibration of arbitrary astronomical images # qfits-an/* # include/astrometry/qfits* # catalogs/ucac4-fits.h -# libkd/an-fls.h # util/makefile.jpeg # util/md5.c # Makefile @@ -44,7 +43,7 @@ URL: http://www.astrometry.net # Download original sources from: # Source0: http://astrometry.net/downloads/%%{name}.net-%%{version}.tar.gz # Then use the provided script to clean them with -# ./generate-tarball %%{version} +# ./astrometry-generate-tarball %%{version} Source0: %{name}.net-%{version}-clean.tar.xz Source1: %{name}-generate-tarball.sh @@ -56,18 +55,16 @@ Source5: astrometry-data-4207.tar.xz Source6: astrometry-data-4208-4219.tar.xz Source7: astrometry-get-data.sh -# Patches from Ole Streicher 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 +# Patches from Ole Streicher used on Debian +Patch: %{name}-%{version}_Add-SONAME-to-libastrometry.so.patch +Patch: %{name}-%{version}_Dynamically-link-to-libastrometry.so-when-possible.patch +Patch: %{name}-%{version}_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch +Patch: %{name}-%{version}_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch +Patch: %{name}-%{version}_Don-t-copy-demo-files-to-examples.patch +Patch: %{name}-%{version}_Remove-errornous-generation-of-net-client.py.patch BuildRequires: gcc +BuildRequires: make BuildRequires: netpbm-devel BuildRequires: python3-numpy BuildRequires: python3-astropy @@ -85,7 +82,6 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(wcslib) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(zlib) -BuildRequires: make %if ! 0%{?bootstrap} BuildRequires: astrometry-tycho2 @@ -98,13 +94,16 @@ Requires: python3-%{name} = %{version}-%{release} # User could use own set of index files or another set from upstream. # Therefore we suggest and not require astrometry-tycho2 here -Suggests: astrometry-tycho2 +Suggests: astrometry-tycho2 + +Provides: bundled(libkd) +Provides: bundled(qfits) # FIXME # Kill s390x build for now, s390x build seems unknown # "cpio: read failed - Inappropriate ioctl for device" error # when unpacking srpm -ExcludeArch: s390x +# ExcludeArch: s390x %description The astrometry engine will take any image and return the astrometry @@ -187,10 +186,6 @@ 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} @@ -204,10 +199,6 @@ Obsoletes: python2-%{name} < %{version}-%{release} %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) @@ -218,16 +209,14 @@ export NETPBM_INC=-I%{_includedir}/netpbm export NETPBM_LIB="-L%{_libdir} -lnetpbm" # Apply mandatory ld flags -export LDFLAGS="%__global_ldflags" +export LDFLAGS="%build_ldflags" -# We use Python3 here -export PYTHON=%{__python3} # Parallel make flags on break build -make SYSTEM_GSL=yes all py extra ARCH_FLAGS="%{optflags}" +make SYSTEM_GSL=yes all py extra \ + ARCH_FLAGS="%{optflags}" %install -export PYTHON=%{__python3} %{make_install} SYSTEM_GSL=yes \ INSTALL_DIR=%{buildroot}%{_prefix} \ PY_BASE_INSTALL_DIR=%{buildroot}%{python3_sitearch}/%{name} \ @@ -253,20 +242,15 @@ for exec in tabmerge tablist; do done popd +# Fix python shebangs +%py3_shebang_fix %{buildroot}%{_bindir}/* + # 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 -# 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 @@ -278,15 +262,20 @@ export PYTHON=%{__python3} make test ARCH_FLAGS="%{optflags}" -%ldconfig_scriptlets libs - - %files %doc CREDITS README.md %license LICENSE %{_mandir}/man1/* %{_bindir}/* -%exclude %{_bindir}/*.py +# Exclude python scripts +%exclude %{_bindir}/degtohms +%exclude %{_bindir}/hmstodeg +%exclude %{_bindir}/image2pnm +%exclude %{_bindir}/merge-columns +%exclude %{_bindir}/removelines +%exclude %{_bindir}/text2fits +%exclude %{_bindir}/uniformize +%exclude %{_bindir}/votabletofits %dir %{_datadir}/astrometry %dir %{_datadir}/astrometry/data %{_datadir}/astrometry/examples @@ -320,13 +309,23 @@ make test ARCH_FLAGS="%{optflags}" %files libs %license LICENSE -%{_libdir}/*.so.* +%{_libdir}/*.so.0* %files -n python3-%{name} -%{python3_sitearch}/* -%{_bindir}/*.py +%{python3_sitearch}/%{name} +%{_bindir}/degtohms +%{_bindir}/hmstodeg +%{_bindir}/image2pnm +%{_bindir}/merge-columns +%{_bindir}/removelines +%{_bindir}/text2fits +%{_bindir}/uniformize +%{_bindir}/votabletofits %changelog +* Sun Feb 06 2022 Mattia Verga - 0.89-1 +- Update to 0.89 (fedora#1828169) + * Wed Jan 19 2022 Fedora Release Engineering - 0.78-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index b54dd55..fe66a3e 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (astrometry-data-4205.tar.xz) = ec9328e8e8211004ce12f101581d1775c03fa2c43 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 +SHA512 (astrometry.net-0.89-clean.tar.xz) = d7fab13d010a41353894a8729c1462ac98ce45f1185182b021720b65b8a9458ca04ffeb3b0b3ac486642e25352652fbbf7b45fa84f573ba08cd2ca707f6350d2 From 2603669b6e1df1b16e4684741121f34fbb3ebb0c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 15 Jun 2022 17:18:23 +0200 Subject: [PATCH 09/45] Rebuilt for Python 3.11 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 4d743ae..eebdaa3 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.89 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -323,6 +323,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jun 15 2022 Python Maint - 0.89-2 +- Rebuilt for Python 3.11 + * Sun Feb 06 2022 Mattia Verga - 0.89-1 - Update to 0.89 (fedora#1828169) From d533b98ab3327c2443a46ff8ffd422095ec3eb77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:25:33 +0000 Subject: [PATCH 10/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index eebdaa3..4a41477 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.89 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -323,6 +323,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.89-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 15 2022 Python Maint - 0.89-2 - Rebuilt for Python 3.11 From 693207bcc810bb03028bab51f0f16577a983e784 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 23 Aug 2022 16:57:29 +0900 Subject: [PATCH 11/45] Rebuild for gsl-2.7.1 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 4a41477..2ca9c5a 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -5,7 +5,7 @@ Name: astrometry Version: 0.89 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -323,6 +323,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Tue Aug 23 2022 Mamoru TASAKA - 0.89-4 +- Rebuild for gsl-2.7.1 + * Wed Jul 20 2022 Fedora Release Engineering - 0.89-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d55c552f5aa4f24a46079a9cf3e2526442457a77 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 1 Nov 2022 14:00:50 +0100 Subject: [PATCH 12/45] Update to 0.91 --- .gitignore | 1 + ...so-that-the-package-can-be-built-on-.patch | 15 +---- astrometry.spec | 55 +++++++++++-------- sources | 2 +- 4 files changed, 36 insertions(+), 37 deletions(-) rename astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch => astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch (74%) diff --git a/.gitignore b/.gitignore index 5a5026f..690ebf1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /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 diff --git a/astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch b/astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch similarity index 74% rename from astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch rename to astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch index 3c9f37f..9f82b3d 100644 --- a/astrometry-0.89_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch +++ b/astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch @@ -3,11 +3,11 @@ 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 | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) + util/makefile.common | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/makefile.common b/util/makefile.common -index 76adf8f..35116e1 100644 +index 0878497..2d3379e 100644 --- a/util/makefile.common +++ b/util/makefile.common @@ -171,9 +171,8 @@ FLAGS_DEF += $(shell $(CCTEST)) @@ -22,12 +22,3 @@ index 76adf8f..35116e1 100644 # Try to guess some good compiler flags for this CPU. # Use -march=native if it's available (gcc 4.2 and above) -@@ -281,7 +280,7 @@ endif - endif - - ifneq (CYGWIN,$(findstring CYGWIN,$(UNAME))) --FLAGS_DEF += -fpic -+FLAGS_DEF += -fpic -fPIC - endif - - # profily! diff --git a/astrometry.spec b/astrometry.spec index 2ca9c5a..6fd433b 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -4,8 +4,8 @@ Name: astrometry -Version: 0.89 -Release: 4%{?dist} +Version: 0.91 +Release: 1%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -56,12 +56,12 @@ Source6: astrometry-data-4208-4219.tar.xz Source7: astrometry-get-data.sh # Patches from Ole Streicher used on Debian -Patch: %{name}-%{version}_Add-SONAME-to-libastrometry.so.patch -Patch: %{name}-%{version}_Dynamically-link-to-libastrometry.so-when-possible.patch -Patch: %{name}-%{version}_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch -Patch: %{name}-%{version}_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch -Patch: %{name}-%{version}_Don-t-copy-demo-files-to-examples.patch -Patch: %{name}-%{version}_Remove-errornous-generation-of-net-client.py.patch +Patch: %{name}-0.89_Add-SONAME-to-libastrometry.so.patch +Patch: %{name}-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch +Patch: %{name}-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch +Patch: %{name}-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch +Patch: %{name}-0.89_Don-t-copy-demo-files-to-examples.patch +Patch: %{name}-0.89_Remove-errornous-generation-of-net-client.py.patch BuildRequires: gcc BuildRequires: make @@ -208,27 +208,24 @@ ln -sf . astrometry export NETPBM_INC=-I%{_includedir}/netpbm export NETPBM_LIB="-L%{_libdir} -lnetpbm" -# Apply mandatory ld flags -export LDFLAGS="%build_ldflags" - # Parallel make flags on break build 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 +%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 \ @@ -243,7 +240,14 @@ done popd # Fix python shebangs -%py3_shebang_fix %{buildroot}%{_bindir}/* +%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 @@ -254,6 +258,9 @@ rm -f %{buildroot}%{_libdir}/*.a # LICENSE file is managed by %%license scriptlet rm -f %{buildroot}%{_docdir}/%{name}/LICENSE +# Remove symlink in bin to python script +rm -f %{buildroot}%{_bindir}/plotann.py + # Install data files install -m0644 astrometry-data*/*.fits %{buildroot}%{_datadir}/%{name}/data diff --git a/sources b/sources index fe66a3e..a2166da 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (astrometry-data-4205.tar.xz) = ec9328e8e8211004ce12f101581d1775c03fa2c43 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.89-clean.tar.xz) = d7fab13d010a41353894a8729c1462ac98ce45f1185182b021720b65b8a9458ca04ffeb3b0b3ac486642e25352652fbbf7b45fa84f573ba08cd2ca707f6350d2 +SHA512 (astrometry.net-0.91-clean.tar.xz) = d404b16ff3c821bc9e2253bff5b9155d82ca593cc639b5f5e3221cf53573746363055ca8e685dc6151b6f13afcc835dd8bb50409198569491bd38a186c6ee5c1 From 1a0dd302c7df9ec1d678d80f0f6f0d941c2a2367 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 1 Nov 2022 14:25:47 +0100 Subject: [PATCH 13/45] Forgot to add changelog entry --- astrometry.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/astrometry.spec b/astrometry.spec index 6fd433b..3c2653c 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -2,6 +2,9 @@ # files, but later package will require them for tests at build time %global bootstrap 1 +# Parallel make flags on break build +%global _smp_build_ncpus 1 + Name: astrometry Version: 0.91 @@ -330,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Tue Nov 01 2022 Mattia Verga - 0.91-1 +- Update to 0.91 (fedora#2078037) + * Tue Aug 23 2022 Mamoru TASAKA - 0.89-4 - Rebuild for gsl-2.7.1 From cc837aa2b3299d1c12c5eb11037e87c890b42ea0 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Thu, 29 Dec 2022 09:30:27 -1000 Subject: [PATCH 14/45] Rebuild for cfitsio 4.2 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 3c2653c..93fde96 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Thu Dec 29 2022 Maxwell G - 0.91-2 +- Rebuild for cfitsio 4.2 + * Tue Nov 01 2022 Mattia Verga - 0.91-1 - Update to 0.91 (fedora#2078037) From cfd2563da38644e8208e494e57c5d485381aad19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 22:20:21 +0000 Subject: [PATCH 15/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 93fde96..2604752 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.91 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Dec 29 2022 Maxwell G - 0.91-2 - Rebuild for cfitsio 4.2 From 0e7c69469b26e8878815fb773ce5a1bbaedf0c52 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 12:51:44 +0200 Subject: [PATCH 16/45] Rebuilt for Python 3.12 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 2604752..1861dad 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.91 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Thu Jun 15 2023 Python Maint - 0.91-4 +- Rebuilt for Python 3.12 + * Wed Jan 18 2023 Fedora Release Engineering - 0.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c27927eae9fd69f5966af696bd3aa118ec87a2fb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:59:41 +0000 Subject: [PATCH 17/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 1861dad..b0a344e 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.91 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.91-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 15 2023 Python Maint - 0.91-4 - Rebuilt for Python 3.12 From ea1160fd22bb792d5b5c8115381c6f0dcd58b201 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 17 Sep 2023 09:40:45 +0200 Subject: [PATCH 18/45] Update to 0.94 --- .gitignore | 1 + astrometry.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 690ebf1..3a989ca 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /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 diff --git a/astrometry.spec b/astrometry.spec index b0a344e..2912925 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -7,8 +7,8 @@ Name: astrometry -Version: 0.91 -Release: 5%{?dist} +Version: 0.94 +Release: 1%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -39,12 +39,12 @@ Summary: Blind astrometric calibration of arbitrary astronomical images # blind/an_mm_malloc.h # util/ctmf.c # -License: BSD and GPLv2+ and GPLv3+ +License: BSD-3-Clause and GPL-2.0-or-later and GPL-3.0-or-later URL: http://www.astrometry.net # Upstream sources contains nonfree stuff so we must clean them # Download original sources from: -# Source0: http://astrometry.net/downloads/%%{name}.net-%%{version}.tar.gz +# Source0: https://github.com/dstndstn/%%{name}.net/releases/download/%%{version}/%%{name}.net-%%{version}.tar.gz # Then use the provided script to clean them with # ./astrometry-generate-tarball %%{version} Source0: %{name}.net-%{version}-clean.tar.xz @@ -333,6 +333,10 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Sun Sep 17 2023 Mattia Verga - 0.94-1 +- Update to 0.94 (fedora#2148995) +- Migrate license to SPDX + * Wed Jul 19 2023 Fedora Release Engineering - 0.91-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index a2166da..77bd5f6 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (astrometry-data-4205.tar.xz) = ec9328e8e8211004ce12f101581d1775c03fa2c43 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.91-clean.tar.xz) = d404b16ff3c821bc9e2253bff5b9155d82ca593cc639b5f5e3221cf53573746363055ca8e685dc6151b6f13afcc835dd8bb50409198569491bd38a186c6ee5c1 +SHA512 (astrometry.net-0.94-clean.tar.xz) = 236fe54faaf31b690fd5b68bebcdd2390e586aea913a863c762be8d102746f4fd11c61f5aec1dbbf633281d8eb23d20682912340a613628dd79f6c194c61c07a From 2abd1438a3ac9d44dab792c3eb61e0b05c01f3fa Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 10 Jan 2024 17:21:49 +0100 Subject: [PATCH 19/45] Rebuilt for libwcs soname bump From 69ba631a5b7e22284142d0964cb821e426b85c26 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Wed, 10 Jan 2024 17:26:38 +0100 Subject: [PATCH 20/45] Bump release --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 2912925..49def1c 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jan 10 2024 Mattia Verga - 0.94-2 +- Rebuilt for libwcs soname bump + * Sun Sep 17 2023 Mattia Verga - 0.94-1 - Update to 0.94 (fedora#2148995) - Migrate license to SPDX From ab7d7a54afc82cae3639dfde3600b4383c24c503 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:46:34 +0000 Subject: [PATCH 21/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 49def1c..56505bd 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -333,6 +333,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 10 2024 Mattia Verga - 0.94-2 - Rebuilt for libwcs soname bump From 15925031be703192895ec75cfcfc5e38c168392d Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 21 Jan 2024 14:24:47 +0100 Subject: [PATCH 22/45] Fix FTB due to distutils removal --- astrometry.spec | 8 +++- numpy-distutils-removal.patch | 71 +++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 numpy-distutils-removal.patch diff --git a/astrometry.spec b/astrometry.spec index 56505bd..61bbc04 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -58,6 +58,8 @@ Source5: astrometry-data-4207.tar.xz Source6: astrometry-data-4208-4219.tar.xz Source7: astrometry-get-data.sh +Patch: numpy-distutils-removal.patch + # Patches from Ole Streicher used on Debian Patch: %{name}-0.89_Add-SONAME-to-libastrometry.so.patch Patch: %{name}-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch @@ -72,6 +74,7 @@ BuildRequires: netpbm-devel BuildRequires: python3-numpy BuildRequires: python3-astropy BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: swig BuildRequires: xorg-x11-proto-devel @@ -333,6 +336,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Sun Jan 21 2024 Mattia Verga - 0.94-4 +- Fix build failure due to removed numpy.distutils and deprecated distutils + * Fri Jan 19 2024 Fedora Release Engineering - 0.94-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/numpy-distutils-removal.patch b/numpy-distutils-removal.patch new file mode 100644 index 0000000..585b1ff --- /dev/null +++ b/numpy-distutils-removal.patch @@ -0,0 +1,71 @@ +diff: a/doc/net: File o directory non esistente +diff: b/doc/net: File o directory non esistente +diff -U 3 -dHrN a/libkd/setup-min.py b/libkd/setup-min.py +--- a/libkd/setup-min.py 2023-05-01 17:19:51.000000000 +0200 ++++ b/libkd/setup-min.py 2024-01-21 14:06:46.581596933 +0100 +@@ -2,11 +2,10 @@ + # Licensed under a 3-clause BSD style license - see LICENSE + from __future__ import print_function + from distutils.core import setup, Extension +-import numpy + import os.path + +-from numpy.distutils.misc_util import get_numpy_include_dirs +-numpy_inc = get_numpy_include_dirs() ++from numpy import get_include ++numpy_inc = get_include() + print('Numpy inc:', numpy_inc) + + def strlist(s, split=' '): +@@ -29,7 +28,7 @@ + + c_module = Extension('spherematch_c', + sources = ['pyspherematch.c'], +- include_dirs = numpy_inc + inc, ++ include_dirs = inc.append(numpy_inc), + extra_objects = ['libkd-min.a'], + extra_compile_args = cflags, + extra_link_args=link, +diff -U 3 -dHrN a/libkd/setup.py b/libkd/setup.py +--- a/libkd/setup.py 2023-05-01 17:19:51.000000000 +0200 ++++ b/libkd/setup.py 2024-01-21 14:07:35.349906565 +0100 +@@ -2,11 +2,10 @@ + # This file is part of libkd. + # Licensed under a 3-clause BSD style license - see LICENSE + from distutils.core import setup, Extension +-import numpy + import os.path + +-from numpy.distutils.misc_util import get_numpy_include_dirs +-numpy_inc = get_numpy_include_dirs() ++from numpy import get_include ++numpy_inc = get_include() + + def strlist(s, split=' '): + lst = s.split(split) +@@ -28,7 +27,7 @@ + + c_module = Extension('spherematch_c', + sources = ['pyspherematch.c'], +- include_dirs = numpy_inc + inc, ++ include_dirs = inc.append(numpy_inc), + extra_objects = objs, + extra_compile_args = cflags, + extra_link_args=link, +diff -U 3 -dHrN a/setup-libkd.py b/setup-libkd.py +--- a/setup-libkd.py 2023-05-01 17:19:51.000000000 +0200 ++++ b/setup-libkd.py 2024-01-21 14:03:46.614136979 +0100 +@@ -1,10 +1,10 @@ + import os + from distutils.core import setup, Extension + +-from numpy.distutils.misc_util import get_numpy_include_dirs +-numpy_inc = get_numpy_include_dirs() ++from numpy import get_include ++numpy_inc = get_include() + +-inc = ['include', 'include/astrometry', 'util', 'qfits-an'] ++inc = ['include', 'include/astrometry', 'util', 'qfits-an', numpy_inc] + + libkd_srcs = [ + 'pyspherematch.c', From 89ac642b37cde9de56485dc9814cc97beb63d95e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:42:10 +0000 Subject: [PATCH 23/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 61bbc04..cc4e590 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -336,6 +336,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.94-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Mattia Verga - 0.94-4 - Fix build failure due to removed numpy.distutils and deprecated distutils From 2ff0bdde1cd77aa74863f3d3789314051752c9b8 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 29 Jan 2024 19:52:32 +0100 Subject: [PATCH 24/45] Rebuild for libwcs soname after mass rebuild --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index cc4e590..0eea22c 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -336,6 +336,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Mon Jan 29 2024 Mattia Verga - 0.94-6 +- Rebuilt for libwcs soname bump + * Mon Jan 22 2024 Fedora Release Engineering - 0.94-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6cbd84c5b9df9c0a8e9796821b2f5d51d54a5e30 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 11:35:40 +0200 Subject: [PATCH 25/45] Rebuilt for Python 3.13 --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 0eea22c..3416330 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -336,6 +336,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Sat Jun 08 2024 Python Maint - 0.94-7 +- Rebuilt for Python 3.13 + * Mon Jan 29 2024 Mattia Verga - 0.94-6 - Rebuilt for libwcs soname bump From bfc86439ba300338a7f9808ba4d7009680319385 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:41:06 +0000 Subject: [PATCH 26/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- astrometry.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/astrometry.spec b/astrometry.spec index 3416330..a84a7ce 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -336,6 +336,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.94-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jun 08 2024 Python Maint - 0.94-7 - Rebuilt for Python 3.13 From c2ed4ec3a2e0684184c2ce1eb33a883614c1e015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:00:43 +0200 Subject: [PATCH 27/45] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- astrometry.spec | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/astrometry.spec b/astrometry.spec index a84a7ce..7777815 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ Name: astrometry Version: 0.94 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -123,7 +123,8 @@ or generate statistics from FITS images. %package data Summary: 2MASS catalog index files for astrometry (4208-4129, wide-field) -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Provides: %{name}-data-4208-4219 = %{version}-%{release} @@ -134,7 +135,8 @@ Provides: %{name}-data-4208-4219 = %{version}-%{release} %package data-4204 Summary: 2MASS catalog index files (4204 series) for astrometry -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} @@ -145,7 +147,8 @@ Enhances: %{name} %package data-4205 Summary: 2MASS catalog index files (4205 series) for astrometry -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} @@ -156,7 +159,8 @@ Enhances: %{name} %package data-4206 Summary: 2MASS catalog index files (4206 series) for astrometry -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} @@ -167,7 +171,8 @@ Enhances: %{name} %package data-4207 Summary: 2MASS catalog index files (4207 series) for astrometry -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} @@ -336,6 +341,9 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.94-9 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0.94-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8737e02193f4007409a7ca8fed7dd48203d439bb Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 5 Aug 2024 10:12:47 +0200 Subject: [PATCH 28/45] Disable i686 build and consolidate data files --- .gitignore | 3 + astrometry-get-data.sh | 87 +++++++---------------- astrometry.spec | 153 ++++++++++++++++------------------------- sources | 8 +-- 4 files changed, 90 insertions(+), 161 deletions(-) diff --git a/.gitignore b/.gitignore index 3a989ca..317a912 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,6 @@ /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 diff --git a/astrometry-get-data.sh b/astrometry-get-data.sh index ea27038..b306e55 100755 --- a/astrometry-get-data.sh +++ b/astrometry-get-data.sh @@ -1,78 +1,39 @@ #!/bin/sh set -e -export XZ_OPT=-9 -# 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 +# 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 done cd .. -#tar -cJf astrometry-data-4204.tar.xz astrometry-data-4204 +tar -I 'zstd -9' -cf astrometry-data-4107-4119.tar.zst astrometry-data-4107-4119 -# 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 +# 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 done cd .. -#tar -cJf astrometry-data-4205.tar.xz astrometry-data-4205 +tar -I 'zstd -9' -cf astrometry-data-5206.tar.zst astrometry-data-5206 -# 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 +# 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 done cd .. -#tar -cJf astrometry-data-4206.tar.xz astrometry-data-4206 +tar -I 'zstd -9' -cf astrometry-data-5205.tar.zst astrometry-data-5205 -# 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-4204 -rm -rf astrometry-data-4205 -rm -rf astrometry-data-4206 -rm -rf astrometry-data-4207 -rm -rf astrometry-data-4208-4219 - - +rm -rf astrometry-data-4107-4119 +rm -rf astrometry-data-5206 +rm -rf astrometry-data-5205 diff --git a/astrometry.spec b/astrometry.spec index 7777815..fd7000e 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -1,14 +1,14 @@ -# 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 - # 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} + Name: astrometry Version: 0.94 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -21,7 +21,7 @@ Summary: Blind astrometric calibration of arbitrary astronomical images # # See also: file CREDITS in source folder # -# General license for astrometry code: 3-clause BSD +# General license for astrometry and libkd code: 3-clause BSD # # GPLv2+: # qfits-an/* @@ -33,7 +33,7 @@ Summary: Blind astrometric calibration of arbitrary astronomical images # doc/UCAC3_guide/* (not used for build and not shipped) # doc/UCAC4_guide/* (not used for build and not shipped) # -# 2MASS data files index-42xx.fits +# .fits data files # # GPLv3+: # blind/an_mm_malloc.h @@ -50,13 +50,11 @@ URL: http://www.astrometry.net Source0: %{name}.net-%{version}-clean.tar.xz Source1: %{name}-generate-tarball.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 +# 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 Patch: numpy-distutils-removal.patch @@ -89,27 +87,17 @@ 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} # User could use own set of index files or another set from upstream. -# Therefore we suggest and not require astrometry-tycho2 here -Suggests: astrometry-tycho2 +# Therefore we recommend and not require index-files from Fedora repos. +Recommends: %{name}-data-4107-4119 = %{version}-%{release} Provides: bundled(libkd) Provides: bundled(qfits) -# 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 @@ -117,68 +105,56 @@ 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, convertion utilities +plotting astronomic information over solved images, conversion utilities or generate statistics from FITS images. -%package data -Summary: 2MASS catalog index files for astrometry (4208-4129, wide-field) -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -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 -# Automatically converted from old format: GPLv2+ - review is highly recommended. +%package data-4107-4119 +Summary: Index files for astrometry (scale 7-19, wide-field) License: GPL-2.0-or-later 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-4204 -2MASS index files (4204 series) with 8-11 arcminutes skymarks for astrometry. +%description data-4107-4119 +Index files for astrometry built from the Tycho-2 catalog +(scales 7-19, wide-field, from 22 to 2000 arcminutes). -%package data-4205 -Summary: 2MASS catalog index files (4205 series) for astrometry -# Automatically converted from old format: GPLv2+ - review is highly recommended. +%package data-5206 +Summary: Index files for astrometry (scale 6, 16 to 22 arcmin) License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} +Obsoletes: %{name}-data-4206 <= %{version}-%{release} +Provides: %{name}-data-4206 = %{version}-%{release} -%description data-4205 -2MASS index files (4205 series) with 11-16 arcminutes skymarks for astrometry. +%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. -%package data-4206 -Summary: 2MASS catalog index files (4206 series) for astrometry -# Automatically converted from old format: GPLv2+ - review is highly recommended. +%package data-5205 +Summary: Index files for astrometry (scale 5, 11 to 16 arcmin) License: GPL-2.0-or-later BuildArch: noarch Requires: %{name} = %{version}-%{release} Enhances: %{name} +Obsoletes: %{name}-data-4205 <= %{version}-%{release} +Provides: %{name}-data-4205 = %{version}-%{release} -%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 -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -BuildArch: noarch -Requires: %{name} = %{version}-%{release} -Enhances: %{name} - -%description data-4207 -2MASS index files (4207 series) with 22-30 arcminutes skymarks for astrometry. +%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. %package devel @@ -188,12 +164,14 @@ 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 @@ -207,21 +185,18 @@ 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} %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" - # Parallel make flags on break build -make SYSTEM_GSL=yes all py extra \ - ARCH_FLAGS="%{optflags}" +%make_build \ + SYSTEM_GSL=yes \ + NETPBM_INC=-I%{_includedir}/netpbm \ + NETPBM_LIB="-L%{_libdir} -lnetpbm" \ + all py extra %install @@ -299,27 +274,14 @@ make test ARCH_FLAGS="%{optflags}" %{_datadir}/astrometry/examples %config(noreplace) %{_sysconfdir}/astrometry.cfg -%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-4107-4119 +%{_datadir}/astrometry/data/index-41*.fits -%files data-4204 -%license astrometry-data-4204/LICENSE -%{_datadir}/astrometry/data/index-4204*.fits +%files data-5206 +%{_datadir}/astrometry/data/index-5206*.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 data-5205 +%{_datadir}/astrometry/data/index-5205*.fits %files devel %{_includedir}/* @@ -341,6 +303,11 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog +* Sun Aug 04 2024 Mattia Verga - 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ý - 0.94-9 - convert license to SPDX diff --git a/sources b/sources index 77bd5f6..c47231b 100644 --- a/sources +++ b/sources @@ -1,6 +1,4 @@ -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.94-clean.tar.xz) = 236fe54faaf31b690fd5b68bebcdd2390e586aea913a863c762be8d102746f4fd11c61f5aec1dbbf633281d8eb23d20682912340a613628dd79f6c194c61c07a +SHA512 (astrometry-data-4107-4119.tar.zst) = e240c5e4b53fb8ae16c320d07c538640b9dda0e92e8add56e6b4946d8cd6fd7559239f67b5b02578d8f6d6dacad4d229189308a5422106971b6a4e004e394311 +SHA512 (astrometry-data-5206.tar.zst) = 36194c33fa8856a925bb64fe1abb16c9ba94629c4626ce609fdb6f2e805ef403c596c6d5c492c1d42f29dd402a1e29249da4d2ab170145ba364533d068c97df2 +SHA512 (astrometry-data-5205.tar.zst) = c5648a9e5067573f49ab3e8a598da4b9c8675a312fe45cd77cdb9ff1430389a50dd8e9ad1a1f80f79211e0d88db3b962942f56aa2b94c38618ece583095ec4c2 From 6b264aafec50cf979209e51748b5ee55eed39b6f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 15 Sep 2024 10:16:55 +0200 Subject: [PATCH 29/45] Convert to %autorelease and %autochangelog [skip changelog] --- astrometry.spec | 157 +----------------------------------------------- changelog | 153 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 155 deletions(-) create mode 100644 changelog diff --git a/astrometry.spec b/astrometry.spec index fd7000e..308b1f5 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -8,7 +8,7 @@ ExcludeArch: %{ix86} Name: astrometry Version: 0.94 -Release: 10%{?dist} +Release: %autorelease Summary: Blind astrometric calibration of arbitrary astronomical images # Software is BSD with some GPL code @@ -303,157 +303,4 @@ make test ARCH_FLAGS="%{optflags}" %{_bindir}/votabletofits %changelog -* Sun Aug 04 2024 Mattia Verga - 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ý - 0.94-9 -- convert license to SPDX - -* Wed Jul 17 2024 Fedora Release Engineering - 0.94-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jun 08 2024 Python Maint - 0.94-7 -- Rebuilt for Python 3.13 - -* Mon Jan 29 2024 Mattia Verga - 0.94-6 -- Rebuilt for libwcs soname bump - -* Mon Jan 22 2024 Fedora Release Engineering - 0.94-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Mattia Verga - 0.94-4 -- Fix build failure due to removed numpy.distutils and deprecated distutils - -* Fri Jan 19 2024 Fedora Release Engineering - 0.94-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jan 10 2024 Mattia Verga - 0.94-2 -- Rebuilt for libwcs soname bump - -* Sun Sep 17 2023 Mattia Verga - 0.94-1 -- Update to 0.94 (fedora#2148995) -- Migrate license to SPDX - -* Wed Jul 19 2023 Fedora Release Engineering - 0.91-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jun 15 2023 Python Maint - 0.91-4 -- Rebuilt for Python 3.12 - -* Wed Jan 18 2023 Fedora Release Engineering - 0.91-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Dec 29 2022 Maxwell G - 0.91-2 -- Rebuild for cfitsio 4.2 - -* Tue Nov 01 2022 Mattia Verga - 0.91-1 -- Update to 0.91 (fedora#2078037) - -* Tue Aug 23 2022 Mamoru TASAKA - 0.89-4 -- Rebuild for gsl-2.7.1 - -* Wed Jul 20 2022 Fedora Release Engineering - 0.89-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jun 15 2022 Python Maint - 0.89-2 -- Rebuilt for Python 3.11 - -* Sun Feb 06 2022 Mattia Verga - 0.89-1 -- Update to 0.89 (fedora#1828169) - -* Wed Jan 19 2022 Fedora Release Engineering - 0.78-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 0.78-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.78-11 -- Rebuilt for Python 3.10 - -* Tue Feb 02 2021 Christian Dersch - 0.78-10 -- Rebuilt for libcfitsio.so.7 - -* Tue Jan 26 2021 Fedora Release Engineering - 0.78-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.78-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.78-7 -- Rebuilt for Python 3.9 - -* Wed Mar 25 2020 Mamoru TASAKA - 0.78-6 -- Rebuild for new wcslib - -* Tue Jan 28 2020 Fedora Release Engineering - 0.78-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 0.78-5 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Tue Aug 20 2019 Susi Lehtola - 0.78-4 -- Rebuilt for GSL 2.6. - -* Mon Aug 19 2019 Miro Hrončok - 0.78-3 -- Rebuilt for Python 3.8 - -* Wed Jul 24 2019 Fedora Release Engineering - 0.78-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Apr 28 2019 Christian Dersch - 0.78-1 -- new version - -* Thu Jan 31 2019 Fedora Release Engineering - 0.76-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Oct 10 2018 Christian Dersch - 0.76-1 -- new version - -* Mon Jul 16 2018 Christian Dersch - 0.75-2 -- Dependency fix, require python3-astrometry, not python2-astrometry - -* Sat Jul 14 2018 Christian Dersch - 0.75-1 -- new version - -* Sat Jul 14 2018 Christian Dersch - 0.74-3 -- Switch to Python 3 -- BuildRequires: gcc - -* Thu Jul 12 2018 Fedora Release Engineering - 0.74-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat May 26 2018 Christian Dersch - 0.74-1 -- new version - -* Sat May 26 2018 Christian Dersch - 0.73-5 -- rebuilt for cfitsio 3.450 - -* Sat Feb 24 2018 Christian Dersch - 0.73-4 -- rebuilt for cfitsio 3.420 (so version bump) - -* Wed Feb 14 2018 Christian Dersch - 0.73-3 -- rebuilt - -* Wed Feb 07 2018 Fedora Release Engineering - 0.73-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Nov 17 2017 Christian Dersch - 0.73-1 -- new version - -* Tue Oct 17 2017 Christian Dersch - 0.72-4 -- Added subpackages for 4204-4207 index files - -* Mon Oct 16 2017 Christian Dersch - 0.72-3 -- Added data subpackage containing the wide-field 2MASS indices - -* Mon Sep 25 2017 Christian Dersch - 0.72-2 -- Move libs to subpackage to be multiarch compatible - -* Tue Sep 12 2017 Christian Dersch - 0.72-1 -- Initial SCM import (#1470436) - -* Wed Jul 12 2017 Christian Dersch - 0.72-0.1 -- initial spec (using the packaging effort from Mattia Verga, RHBZ #1299139) - +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..772509b --- /dev/null +++ b/changelog @@ -0,0 +1,153 @@ +* Sun Aug 04 2024 Mattia Verga - 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ý - 0.94-9 +- convert license to SPDX + +* Wed Jul 17 2024 Fedora Release Engineering - 0.94-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jun 08 2024 Python Maint - 0.94-7 +- Rebuilt for Python 3.13 + +* Mon Jan 29 2024 Mattia Verga - 0.94-6 +- Rebuilt for libwcs soname bump + +* Mon Jan 22 2024 Fedora Release Engineering - 0.94-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Mattia Verga - 0.94-4 +- Fix build failure due to removed numpy.distutils and deprecated distutils + +* Fri Jan 19 2024 Fedora Release Engineering - 0.94-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 10 2024 Mattia Verga - 0.94-2 +- Rebuilt for libwcs soname bump + +* Sun Sep 17 2023 Mattia Verga - 0.94-1 +- Update to 0.94 (fedora#2148995) +- Migrate license to SPDX + +* Wed Jul 19 2023 Fedora Release Engineering - 0.91-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 15 2023 Python Maint - 0.91-4 +- Rebuilt for Python 3.12 + +* Wed Jan 18 2023 Fedora Release Engineering - 0.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Dec 29 2022 Maxwell G - 0.91-2 +- Rebuild for cfitsio 4.2 + +* Tue Nov 01 2022 Mattia Verga - 0.91-1 +- Update to 0.91 (fedora#2078037) + +* Tue Aug 23 2022 Mamoru TASAKA - 0.89-4 +- Rebuild for gsl-2.7.1 + +* Wed Jul 20 2022 Fedora Release Engineering - 0.89-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jun 15 2022 Python Maint - 0.89-2 +- Rebuilt for Python 3.11 + +* Sun Feb 06 2022 Mattia Verga - 0.89-1 +- Update to 0.89 (fedora#1828169) + +* Wed Jan 19 2022 Fedora Release Engineering - 0.78-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 0.78-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.78-11 +- Rebuilt for Python 3.10 + +* Tue Feb 02 2021 Christian Dersch - 0.78-10 +- Rebuilt for libcfitsio.so.7 + +* Tue Jan 26 2021 Fedora Release Engineering - 0.78-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 0.78-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.78-7 +- Rebuilt for Python 3.9 + +* Wed Mar 25 2020 Mamoru TASAKA - 0.78-6 +- Rebuild for new wcslib + +* Tue Jan 28 2020 Fedora Release Engineering - 0.78-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 0.78-5 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Tue Aug 20 2019 Susi Lehtola - 0.78-4 +- Rebuilt for GSL 2.6. + +* Mon Aug 19 2019 Miro Hrončok - 0.78-3 +- Rebuilt for Python 3.8 + +* Wed Jul 24 2019 Fedora Release Engineering - 0.78-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Apr 28 2019 Christian Dersch - 0.78-1 +- new version + +* Thu Jan 31 2019 Fedora Release Engineering - 0.76-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Oct 10 2018 Christian Dersch - 0.76-1 +- new version + +* Mon Jul 16 2018 Christian Dersch - 0.75-2 +- Dependency fix, require python3-astrometry, not python2-astrometry + +* Sat Jul 14 2018 Christian Dersch - 0.75-1 +- new version + +* Sat Jul 14 2018 Christian Dersch - 0.74-3 +- Switch to Python 3 +- BuildRequires: gcc + +* Thu Jul 12 2018 Fedora Release Engineering - 0.74-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat May 26 2018 Christian Dersch - 0.74-1 +- new version + +* Sat May 26 2018 Christian Dersch - 0.73-5 +- rebuilt for cfitsio 3.450 + +* Sat Feb 24 2018 Christian Dersch - 0.73-4 +- rebuilt for cfitsio 3.420 (so version bump) + +* Wed Feb 14 2018 Christian Dersch - 0.73-3 +- rebuilt + +* Wed Feb 07 2018 Fedora Release Engineering - 0.73-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Nov 17 2017 Christian Dersch - 0.73-1 +- new version + +* Tue Oct 17 2017 Christian Dersch - 0.72-4 +- Added subpackages for 4204-4207 index files + +* Mon Oct 16 2017 Christian Dersch - 0.72-3 +- Added data subpackage containing the wide-field 2MASS indices + +* Mon Sep 25 2017 Christian Dersch - 0.72-2 +- Move libs to subpackage to be multiarch compatible + +* Tue Sep 12 2017 Christian Dersch - 0.72-1 +- Initial SCM import (#1470436) + +* Wed Jul 12 2017 Christian Dersch - 0.72-0.1 +- initial spec (using the packaging effort from Mattia Verga, RHBZ #1299139) From 036fab2a367e798f1ec066eb1eebb687e59b66d2 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 15 Sep 2024 10:36:11 +0200 Subject: [PATCH 30/45] Update to 0.96 ... (fedora#2312406) - Prepare to support numpy 2 --- .gitignore | 1 + astrometry.spec | 4 +- numpy-distutils-removal.patch | 71 ----------------------------------- sources | 2 +- 4 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 numpy-distutils-removal.patch diff --git a/.gitignore b/.gitignore index 317a912..c991190 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /astrometry-data-4107-4119.tar.zst /astrometry-data-5206.tar.zst /astrometry-data-5205.tar.zst +/astrometry.net-0.96-clean.tar.xz diff --git a/astrometry.spec b/astrometry.spec index 308b1f5..f0694d4 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: astrometry -Version: 0.94 +Version: 0.96 Release: %autorelease Summary: Blind astrometric calibration of arbitrary astronomical images @@ -56,8 +56,6 @@ Source3: astrometry-data-5206.tar.zst Source4: astrometry-data-5205.tar.zst Source5: astrometry-get-data.sh -Patch: numpy-distutils-removal.patch - # Patches from Ole Streicher used on Debian Patch: %{name}-0.89_Add-SONAME-to-libastrometry.so.patch Patch: %{name}-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch diff --git a/numpy-distutils-removal.patch b/numpy-distutils-removal.patch deleted file mode 100644 index 585b1ff..0000000 --- a/numpy-distutils-removal.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff: a/doc/net: File o directory non esistente -diff: b/doc/net: File o directory non esistente -diff -U 3 -dHrN a/libkd/setup-min.py b/libkd/setup-min.py ---- a/libkd/setup-min.py 2023-05-01 17:19:51.000000000 +0200 -+++ b/libkd/setup-min.py 2024-01-21 14:06:46.581596933 +0100 -@@ -2,11 +2,10 @@ - # Licensed under a 3-clause BSD style license - see LICENSE - from __future__ import print_function - from distutils.core import setup, Extension --import numpy - import os.path - --from numpy.distutils.misc_util import get_numpy_include_dirs --numpy_inc = get_numpy_include_dirs() -+from numpy import get_include -+numpy_inc = get_include() - print('Numpy inc:', numpy_inc) - - def strlist(s, split=' '): -@@ -29,7 +28,7 @@ - - c_module = Extension('spherematch_c', - sources = ['pyspherematch.c'], -- include_dirs = numpy_inc + inc, -+ include_dirs = inc.append(numpy_inc), - extra_objects = ['libkd-min.a'], - extra_compile_args = cflags, - extra_link_args=link, -diff -U 3 -dHrN a/libkd/setup.py b/libkd/setup.py ---- a/libkd/setup.py 2023-05-01 17:19:51.000000000 +0200 -+++ b/libkd/setup.py 2024-01-21 14:07:35.349906565 +0100 -@@ -2,11 +2,10 @@ - # This file is part of libkd. - # Licensed under a 3-clause BSD style license - see LICENSE - from distutils.core import setup, Extension --import numpy - import os.path - --from numpy.distutils.misc_util import get_numpy_include_dirs --numpy_inc = get_numpy_include_dirs() -+from numpy import get_include -+numpy_inc = get_include() - - def strlist(s, split=' '): - lst = s.split(split) -@@ -28,7 +27,7 @@ - - c_module = Extension('spherematch_c', - sources = ['pyspherematch.c'], -- include_dirs = numpy_inc + inc, -+ include_dirs = inc.append(numpy_inc), - extra_objects = objs, - extra_compile_args = cflags, - extra_link_args=link, -diff -U 3 -dHrN a/setup-libkd.py b/setup-libkd.py ---- a/setup-libkd.py 2023-05-01 17:19:51.000000000 +0200 -+++ b/setup-libkd.py 2024-01-21 14:03:46.614136979 +0100 -@@ -1,10 +1,10 @@ - import os - from distutils.core import setup, Extension - --from numpy.distutils.misc_util import get_numpy_include_dirs --numpy_inc = get_numpy_include_dirs() -+from numpy import get_include -+numpy_inc = get_include() - --inc = ['include', 'include/astrometry', 'util', 'qfits-an'] -+inc = ['include', 'include/astrometry', 'util', 'qfits-an', numpy_inc] - - libkd_srcs = [ - 'pyspherematch.c', diff --git a/sources b/sources index c47231b..22db2fd 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (astrometry.net-0.94-clean.tar.xz) = 236fe54faaf31b690fd5b68bebcdd2390e586aea913a863c762be8d102746f4fd11c61f5aec1dbbf633281d8eb23d20682912340a613628dd79f6c194c61c07a 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.96-clean.tar.xz) = 62107046d9023799f98b16773e0ddc9148bb9564687746aba95d29078909aed0ebceb394678b672f6deccd1d07cde114c4cd3a2fa3bf5d008fe5399e4066cf94 From 019a34b1ec92c08b7f7cf0f2fd77ba9b96d859b2 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 27 Sep 2024 10:36:54 +0200 Subject: [PATCH 31/45] Rename binaries names conflicting with ... cfitsio binaries - Remove fitsverify binary which is now provided by own package --- astrometry.spec | 70 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/astrometry.spec b/astrometry.spec index f0694d4..b82e822 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -89,6 +89,8 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: netpbm-progs Requires: python3-%{name} = %{version}-%{release} +Recommends: cfitsio-utils +Recommends: fitsverify # 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} @@ -216,13 +218,24 @@ sed -i \ "s:%{buildroot}%{_prefix}/data:%{_datadir}/%{name}/data:" \ %{buildroot}/etc/astrometry.cfg -# Rename generic named executables with known conflict +# Rename executables taken from cfitsio code pushd %{buildroot}%{_bindir} -for exec in tabmerge tablist; do +for exec in imarith imstat listhead liststruc modhead tabmerge tablist; do mv $exec astrometry-$exec done popd +#TODO These will be provided by cfitsio-utils +# Rename them for the moment to avoid conflicts +pushd %{buildroot}%{_bindir} +for exec in fitscopy imcopy; do + mv $exec astrometry-$exec +done +popd + +#TODO fitsverify is provided by its own package +rm -f %{buildroot}%{_bindir}/fitsverify + # Fix python shebangs %py3_shebang_fix %{buildroot}%{_bindir}/degtohms \ %{buildroot}%{_bindir}/hmstodeg \ @@ -248,6 +261,7 @@ rm -f %{buildroot}%{_bindir}/plotann.py # Install data files install -m0644 astrometry-data*/*.fits %{buildroot}%{_datadir}/%{name}/data + %check export PYTHON=%{__python3} make test ARCH_FLAGS="%{optflags}" @@ -257,16 +271,48 @@ make test ARCH_FLAGS="%{optflags}" %doc CREDITS README.md %license LICENSE %{_mandir}/man1/* -%{_bindir}/* -# Exclude python scripts -%exclude %{_bindir}/degtohms -%exclude %{_bindir}/hmstodeg -%exclude %{_bindir}/image2pnm -%exclude %{_bindir}/merge-columns -%exclude %{_bindir}/removelines -%exclude %{_bindir}/text2fits -%exclude %{_bindir}/uniformize -%exclude %{_bindir}/votabletofits +%{_bindir}/an-fitstopnm +%{_bindir}/an-pnmtofits +%{_bindir}/astrometry-engine +%{_bindir}/astrometry-fitscopy +%{_bindir}/astrometry-imarith +%{_bindir}/astrometry-imcopy +%{_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 %dir %{_datadir}/astrometry %dir %{_datadir}/astrometry/data %{_datadir}/astrometry/examples From debc154f70fd1b3e7a7a5b8d8737717d70a3ccb9 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 14 Dec 2024 14:46:23 +0100 Subject: [PATCH 32/45] Update to 0.97 (fedora#2330074) --- .gitignore | 1 + ...ch => Add-SONAME-to-libastrometry.so.patch | 6 ++-- ...=> Don-t-copy-demo-files-to-examples.patch | 4 +-- ...nk-to-libastrometry.so-when-possible.patch | 16 ++++----- ...-Debian-libs-instead-of-convienience.patch | 4 +-- ...at-the-package-can-be-built-on-s390x.patch | 4 +-- ...rrornous-generation-of-net-client.py.patch | 6 ++-- Remove-horizons.py-from-Python-package.patch | 23 +++++++++++++ astrometry.spec | 34 +++++-------------- sources | 2 +- 10 files changed, 54 insertions(+), 46 deletions(-) rename astrometry-0.89_Add-SONAME-to-libastrometry.so.patch => Add-SONAME-to-libastrometry.so.patch (86%) rename astrometry-0.89_Don-t-copy-demo-files-to-examples.patch => Don-t-copy-demo-files-to-examples.patch (89%) rename astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch => Dynamically-link-to-libastrometry.so-when-possible.patch (88%) rename astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch => Fix-issues-when-using-Debian-libs-instead-of-convienience.patch (93%) rename astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch => Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch (90%) rename astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch => Remove-errornous-generation-of-net-client.py.patch (89%) create mode 100644 Remove-horizons.py-from-Python-package.patch diff --git a/.gitignore b/.gitignore index c991190..4cceb45 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /astrometry-data-5206.tar.zst /astrometry-data-5205.tar.zst /astrometry.net-0.96-clean.tar.xz +/astrometry.net-0.97-clean.tar.xz diff --git a/astrometry-0.89_Add-SONAME-to-libastrometry.so.patch b/Add-SONAME-to-libastrometry.so.patch similarity index 86% rename from astrometry-0.89_Add-SONAME-to-libastrometry.so.patch rename to Add-SONAME-to-libastrometry.so.patch index 6a38df2..4faf901 100644 --- a/astrometry-0.89_Add-SONAME-to-libastrometry.so.patch +++ b/Add-SONAME-to-libastrometry.so.patch @@ -7,10 +7,10 @@ Subject: Add SONAME to libastrometry.so 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/solver/Makefile b/solver/Makefile -index 6870244..08f5e35 100644 +index ac44402..3c06b16 100644 --- a/solver/Makefile +++ b/solver/Makefile -@@ -134,7 +134,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) +@@ -136,7 +136,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) $(RANLIB) $@ $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB) @@ -20,7 +20,7 @@ index 6870244..08f5e35 100644 # old and miscellaneous executables that aren't part of the pipeline. OLDEXECS := checkquads -@@ -205,8 +206,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB) +@@ -212,8 +213,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB) done $(MKDIR) '$(LIB_INSTALL_DIR)' @for x in $(INSTALL_LIB); do \ diff --git a/astrometry-0.89_Don-t-copy-demo-files-to-examples.patch b/Don-t-copy-demo-files-to-examples.patch similarity index 89% rename from astrometry-0.89_Don-t-copy-demo-files-to-examples.patch rename to Don-t-copy-demo-files-to-examples.patch index c33af75..cd7660e 100644 --- a/astrometry-0.89_Don-t-copy-demo-files-to-examples.patch +++ b/Don-t-copy-demo-files-to-examples.patch @@ -7,10 +7,10 @@ Subject: Don't copy demo files to examples 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index a8878f2..391c2d5 100644 +index 4b3fc9c..5c6b104 100644 --- a/Makefile +++ b/Makefile -@@ -157,7 +157,6 @@ install-core: +@@ -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)' diff --git a/astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch b/Dynamically-link-to-libastrometry.so-when-possible.patch similarity index 88% rename from astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch rename to Dynamically-link-to-libastrometry.so-when-possible.patch index f000c03..890043c 100644 --- a/astrometry-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch +++ b/Dynamically-link-to-libastrometry.so-when-possible.patch @@ -9,7 +9,7 @@ Subject: Dynamically link to libastrometry.so, when possible 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/libkd/Makefile b/libkd/Makefile -index d8de18e..77c0f3d 100644 +index 3a43d44..416ff9a 100644 --- a/libkd/Makefile +++ b/libkd/Makefile @@ -92,8 +92,7 @@ py: pyspherematch @@ -23,7 +23,7 @@ index d8de18e..77c0f3d 100644 CFLAGS="$(CFLAGS)" \ $(PYTHON) setup.py build_ext --inplace --force --build-temp . diff --git a/solver/Makefile b/solver/Makefile -index 08f5e35..cdc98cd 100644 +index 3c06b16..a0c5084 100644 --- a/solver/Makefile +++ b/solver/Makefile @@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF) @@ -37,7 +37,7 @@ index 08f5e35..cdc98cd 100644 CFLAGS += $(CFLAGS_DEF) CFLAGS += $(CATS_INC) -@@ -122,7 +120,7 @@ ENGINE_OBJS += new-wcs.o fits-guess-scale.o cut-table.o \ +@@ -124,7 +122,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 +46,7 @@ index 08f5e35..cdc98cd 100644 unpermute-quads.o merge-index.o ENGINE_OBJS += $(BUILD_INDEX_OBJS) -@@ -133,8 +131,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) +@@ -135,8 +133,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) $(AR) rc $@ $(ENGINE_OBJS) $(RANLIB) $@ @@ -58,10 +58,10 @@ index 08f5e35..cdc98cd 100644 # old and miscellaneous executables that aren't part of the pipeline. diff --git a/util/Makefile b/util/Makefile -index 1909bf4..db92966 100644 +index 3481077..9253faa 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -55,8 +55,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \ +@@ -56,8 +56,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \ tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o ANFILES_DEPS += $(QFITS_LIB) @@ -71,7 +71,7 @@ index 1909bf4..db92966 100644 ANUTILS_DEPS += $(QFITS_LIB) endif -@@ -101,8 +100,7 @@ CFLAGS += -I. +@@ -102,8 +101,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) @@ -81,7 +81,7 @@ index 1909bf4..db92966 100644 SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) -@@ -166,7 +164,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) +@@ -167,7 +165,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) ALL_OBJ += an-pnmtofits.o _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) diff --git a/astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch b/Fix-issues-when-using-Debian-libs-instead-of-convienience.patch similarity index 93% rename from astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch rename to Fix-issues-when-using-Debian-libs-instead-of-convienience.patch index fcc01f2..5f7039f 100644 --- a/astrometry-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch +++ b/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 db92966..dc4562d 100644 +index 9253faa..95835a1 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -100,7 +100,7 @@ CFLAGS += -I. +@@ -101,7 +101,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) diff --git a/astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch b/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch similarity index 90% rename from astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch rename to Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch index 9f82b3d..160dc48 100644 --- a/astrometry-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch +++ b/Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.patch @@ -7,10 +7,10 @@ Subject: Fix shared lib flags so that the package can be built on s390x 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/util/makefile.common b/util/makefile.common -index 0878497..2d3379e 100644 +index 1d40053..315e78f 100644 --- a/util/makefile.common +++ b/util/makefile.common -@@ -171,9 +171,8 @@ FLAGS_DEF += $(shell $(CCTEST)) +@@ -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. diff --git a/astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch b/Remove-errornous-generation-of-net-client.py.patch similarity index 89% rename from astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch rename to Remove-errornous-generation-of-net-client.py.patch index e30d4f2..5fa6c39 100644 --- a/astrometry-0.89_Remove-errornous-generation-of-net-client.py.patch +++ b/Remove-errornous-generation-of-net-client.py.patch @@ -7,10 +7,10 @@ Subject: Remove errornous generation of net/client.py 1 file changed, 7 deletions(-) diff --git a/Makefile b/Makefile -index aa17acb..add4fd8 100644 +index 3870c68..4b3fc9c 100644 --- a/Makefile +++ b/Makefile -@@ -165,13 +165,6 @@ install-core: +@@ -182,13 +182,6 @@ install-core: $(MAKE) -C qfits-an install $(MAKE) -C solver install $(MAKE) -C sdss install @@ -23,4 +23,4 @@ index aa17acb..add4fd8 100644 - done .PHONY: install install-core - ifeq ($(SYSTEM_GSL),yes) + install-cfitsio-utils: diff --git a/Remove-horizons.py-from-Python-package.patch b/Remove-horizons.py-from-Python-package.patch new file mode 100644 index 0000000..2f7c984 --- /dev/null +++ b/Remove-horizons.py-from-Python-package.patch @@ -0,0 +1,23 @@ +From: Ole Streicher +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) diff --git a/astrometry.spec b/astrometry.spec index b82e822..1543faa 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: astrometry -Version: 0.96 +Version: 0.97 Release: %autorelease Summary: Blind astrometric calibration of arbitrary astronomical images @@ -57,12 +57,13 @@ Source4: astrometry-data-5205.tar.zst Source5: astrometry-get-data.sh # Patches from Ole Streicher used on Debian -Patch: %{name}-0.89_Add-SONAME-to-libastrometry.so.patch -Patch: %{name}-0.89_Dynamically-link-to-libastrometry.so-when-possible.patch -Patch: %{name}-0.89_Fix-issues-when-using-Debian-libs-instead-of-convienience.patch -Patch: %{name}-0.91_Fix-shared-lib-flags-so-that-the-package-can-be-built-on-.patch -Patch: %{name}-0.89_Don-t-copy-demo-files-to-examples.patch -Patch: %{name}-0.89_Remove-errornous-generation-of-net-client.py.patch +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 BuildRequires: gcc BuildRequires: make @@ -90,7 +91,6 @@ Requires: netpbm-progs Requires: python3-%{name} = %{version}-%{release} Recommends: cfitsio-utils -Recommends: fitsverify # 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} @@ -225,17 +225,6 @@ for exec in imarith imstat listhead liststruc modhead tabmerge tablist; do done popd -#TODO These will be provided by cfitsio-utils -# Rename them for the moment to avoid conflicts -pushd %{buildroot}%{_bindir} -for exec in fitscopy imcopy; do - mv $exec astrometry-$exec -done -popd - -#TODO fitsverify is provided by its own package -rm -f %{buildroot}%{_bindir}/fitsverify - # Fix python shebangs %py3_shebang_fix %{buildroot}%{_bindir}/degtohms \ %{buildroot}%{_bindir}/hmstodeg \ @@ -252,9 +241,6 @@ rm -f %{buildroot}%{_docdir}/%{name}/report.txt # We don't ship static libraries so we remove them rm -f %{buildroot}%{_libdir}/*.a -# LICENSE file is managed by %%license scriptlet -rm -f %{buildroot}%{_docdir}/%{name}/LICENSE - # Remove symlink in bin to python script rm -f %{buildroot}%{_bindir}/plotann.py @@ -269,14 +255,12 @@ make test ARCH_FLAGS="%{optflags}" %files %doc CREDITS README.md -%license LICENSE +%license %{_docdir}/%{name}/LICENSE %{_mandir}/man1/* %{_bindir}/an-fitstopnm %{_bindir}/an-pnmtofits %{_bindir}/astrometry-engine -%{_bindir}/astrometry-fitscopy %{_bindir}/astrometry-imarith -%{_bindir}/astrometry-imcopy %{_bindir}/astrometry-imstat %{_bindir}/astrometry-listhead %{_bindir}/astrometry-liststruc diff --git a/sources b/sources index 22db2fd..8e20771 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 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.96-clean.tar.xz) = 62107046d9023799f98b16773e0ddc9148bb9564687746aba95d29078909aed0ebceb394678b672f6deccd1d07cde114c4cd3a2fa3bf5d008fe5399e4066cf94 +SHA512 (astrometry.net-0.97-clean.tar.xz) = ef28fc05a48be2ad7d70cbf430ed989d23a62ae322c30cdf543142164102c64960db33965827963534679c70f6858646ec700962c104b23d795b55fd79618fde From 1f14c8ec4ab834fcfcad8d5eff4c25f4be13abde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:49:36 +0000 Subject: [PATCH 33/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 495c236b651a478521fe3e71f5db44cb6d1f0132 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 2 Feb 2025 13:37:48 -0700 Subject: [PATCH 34/45] Rebuild with gsl 2.8 From 37f7c38d50934c7371e6a52176a313e9578cb10d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 13:37:54 +0200 Subject: [PATCH 35/45] Rebuilt for Python 3.14 From 7af451650c9924aef4916bd9daef448d1ea31836 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:22:06 +0000 Subject: [PATCH 36/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ed3b6bef15ca0cc0b636ee3c1848e40bbf7633c5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:38:44 +0200 Subject: [PATCH 37/45] Rebuilt for Python 3.14.0rc2 bytecode From 75ea98d4021a8e8ac61a0e8abc8f442e8caac297 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:07:42 +0200 Subject: [PATCH 38/45] Rebuilt for Python 3.14.0rc3 bytecode From dead2aa3fdb933918464a747780c7df0e0deb6cf Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 30 Nov 2025 10:43:42 +0100 Subject: [PATCH 39/45] Update to 0.98 (Fedora#2407438) --- .gitignore | 1 + Add-SONAME-to-libastrometry.so.patch | 2 +- ...y-link-to-libastrometry.so-when-possible.patch | 15 ++++++++------- astrometry.spec | 2 +- sources | 1 + 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4cceb45..b660784 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /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 diff --git a/Add-SONAME-to-libastrometry.so.patch b/Add-SONAME-to-libastrometry.so.patch index 4faf901..89f0c4a 100644 --- a/Add-SONAME-to-libastrometry.so.patch +++ b/Add-SONAME-to-libastrometry.so.patch @@ -7,7 +7,7 @@ Subject: Add SONAME to libastrometry.so 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/solver/Makefile b/solver/Makefile -index ac44402..3c06b16 100644 +index a82a7bd..a65f728 100644 --- a/solver/Makefile +++ b/solver/Makefile @@ -136,7 +136,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS) diff --git a/Dynamically-link-to-libastrometry.so-when-possible.patch b/Dynamically-link-to-libastrometry.so-when-possible.patch index 890043c..0ed5e08 100644 --- a/Dynamically-link-to-libastrometry.so-when-possible.patch +++ b/Dynamically-link-to-libastrometry.so-when-possible.patch @@ -5,8 +5,8 @@ Subject: Dynamically link to libastrometry.so, when possible --- libkd/Makefile | 3 +-- solver/Makefile | 10 ++++------ - util/Makefile | 8 +++----- - 3 files changed, 8 insertions(+), 13 deletions(-) + util/Makefile | 9 +++------ + 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libkd/Makefile b/libkd/Makefile index 3a43d44..416ff9a 100644 @@ -23,7 +23,7 @@ index 3a43d44..416ff9a 100644 CFLAGS="$(CFLAGS)" \ $(PYTHON) setup.py build_ext --inplace --force --build-temp . diff --git a/solver/Makefile b/solver/Makefile -index 3c06b16..a0c5084 100644 +index a65f728..343d38e 100644 --- a/solver/Makefile +++ b/solver/Makefile @@ -45,9 +45,7 @@ LDFLAGS := $(LDFLAGS_DEF) @@ -58,10 +58,10 @@ index 3c06b16..a0c5084 100644 # old and miscellaneous executables that aren't part of the pipeline. diff --git a/util/Makefile b/util/Makefile -index 3481077..9253faa 100644 +index e5700ba..c125022 100644 --- a/util/Makefile +++ b/util/Makefile -@@ -56,8 +56,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \ +@@ -57,8 +57,7 @@ ANFILES_OBJ += multiindex.o index.o indexset.o \ tabsort.o wcs-xy2rd.o wcs-rd2xy.o matchfile.o ANFILES_DEPS += $(QFITS_LIB) @@ -71,17 +71,18 @@ index 3481077..9253faa 100644 ANUTILS_DEPS += $(QFITS_LIB) endif -@@ -102,8 +101,7 @@ CFLAGS += -I. +@@ -105,9 +104,7 @@ CFLAGS += -I. LDFLAGS += $(LDFLAGS_DEF) -LDLIBS := $(LDLIBS_DEF) -LDLIBS += $(ANFILES_LIB) +-LDLIBS += $(ANUTILS_LIB) +LDLIBS := $(LDLIBS_DEF) -lm SHAREDLIBFLAGS := $(SHAREDLIBFLAGS_DEF) -@@ -167,7 +165,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) +@@ -171,7 +168,7 @@ an-pnmtofits: an-pnmtofits.o $(ANUTILS_SLIB) ALL_OBJ += an-pnmtofits.o _util$(PYTHON_SO_EXT): util.i lanczos.i $(ANFILES_SLIB) diff --git a/astrometry.spec b/astrometry.spec index 1543faa..04df1e3 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -7,7 +7,7 @@ ExcludeArch: %{ix86} Name: astrometry -Version: 0.97 +Version: 0.98 Release: %autorelease Summary: Blind astrometric calibration of arbitrary astronomical images diff --git a/sources b/sources index 8e20771..ca57343 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ SHA512 (astrometry-data-4107-4119.tar.zst) = e240c5e4b53fb8ae16c320d07c538640b9d 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 From 0849353c965e8c4e6bba51aceb1d3986531f5972 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 04:03:58 +0000 Subject: [PATCH 40/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From b5b66ca5de2255f7119e4226cdd421736f59e379 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 08:00:45 +0000 Subject: [PATCH 41/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From e51e0375646d8b77f4428e72e164103a6d5df664 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 5 Jun 2026 20:45:46 +0200 Subject: [PATCH 42/45] Rebuilt for Python 3.15 From 195536766760f9bfa141579e5756d5faa1a60354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 15 Jul 2026 19:50:53 +0000 Subject: [PATCH 43/45] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 67638efcbaff4638e60d321cdc5cbce546485050 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 11:08:21 +0200 Subject: [PATCH 44/45] Rebuilt for Python 3.15.0b4 ABI change From eb38925935eb1ba9dac564f2389c992b4320ab48 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 28 Jul 2026 15:29:18 +0200 Subject: [PATCH 45/45] Replace removed Python 2 C API macros for SWIG 4.5.0 compatibility --- ...Python-2-C-API-macros-for-SWIG-4.5.0.patch | 110 ++++++++++++++++++ astrometry.spec | 3 + 2 files changed, 113 insertions(+) create mode 100644 Replace-removed-Python-2-C-API-macros-for-SWIG-4.5.0.patch diff --git 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 new file mode 100644 index 0000000..f0a1776 --- /dev/null +++ b/Replace-removed-Python-2-C-API-macros-for-SWIG-4.5.0.patch @@ -0,0 +1,110 @@ +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 +@@ -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 diff --git a/astrometry.spec b/astrometry.spec index 04df1e3..423a4d3 100644 --- a/astrometry.spec +++ b/astrometry.spec @@ -64,6 +64,9 @@ Patch: Fix-shared-lib-flags-so-that-the-package-can-be-built-on-s390x.p 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 BuildRequires: gcc BuildRequires: make