From e1bb36936628814e8b9bad5fba03da759b6d5304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:01:17 +0000 Subject: [PATCH 01/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index fd05e6d..d8092c2 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -88,6 +88,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jun 27 2020 Mattia Verga - 3.9.6-1 - Update to 3.9.6 From ef50d17417790ad702ed5d01e6ccd3fa0a4e5cba Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 13 Jan 2021 02:27:50 +0000 Subject: [PATCH 02/20] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- wcstools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wcstools.spec b/wcstools.spec index d8092c2..5ed55b3 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -6,6 +6,7 @@ License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz +BuildRequires: make BuildRequires: gcc # Patch from Debian to create shared lib and rename it to avoid From a8f38be43cb33b6d183889c773a21136afdc1fab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:22:48 +0000 Subject: [PATCH 03/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 5ed55b3..719a2b6 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -89,6 +89,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.9.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From de829022cfd4b707b5084c79b5448be355cf7014 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:49:13 +0000 Subject: [PATCH 04/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 719a2b6..d26962d 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -89,6 +89,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 896dee164768b91f5a655e12f70d61fa87de9975 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:20:06 +0000 Subject: [PATCH 05/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index d26962d..8f024f7 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -89,6 +89,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.9.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.9.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 60726e2b037cb53afb3fe41c64e6780d0e6b6295 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 30 Apr 2022 16:07:54 +0200 Subject: [PATCH 06/20] Move changelog to external file --- changelog | 128 +++++++++++++++++++++++++++++++++++++++++++++++++ wcstools.spec | 129 +------------------------------------------------- 2 files changed, 129 insertions(+), 128 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..cd8e188 --- /dev/null +++ b/changelog @@ -0,0 +1,128 @@ +* Sat Jan 22 2022 Fedora Release Engineering - 3.9.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jun 27 2020 Mattia Verga - 3.9.6-1 +- Update to 3.9.6 + +* Fri Jan 31 2020 Fedora Release Engineering - 3.9.5-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 3.9.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3.9.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3.9.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Sat Jun 30 2018 Mattia Verga - 3.9.5-7 +- Remove ldconfig scriptlets + +* Mon Feb 19 2018 Mattia Verga - 3.9.5-6 +- Add gcc to BuildRequires + +* Fri Feb 09 2018 Fedora Release Engineering - 3.9.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 3.9.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 3.9.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat May 20 2017 Mattia Verga - 3.9.5-2 +- Rename remap to wcsremap. See #1450190 + +* Fri Apr 14 2017 Mattia Verga - 3.9.5-1 +- Update to 3.9.5 + +* Sat Feb 11 2017 Fedora Release Engineering - 3.9.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sun Jan 15 2017 Mattia Verga - 3.9.4-1 +- Update to 3.9.4 + +* Mon Feb 07 2011 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Feb 03 2010 Sergio Pascual 3.8.1-1 +- New upstream source +- Patch to fix bz #559863 from upstream + +* Mon Jul 27 2009 Fedora Release Engineering - 3.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 3.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Feb 19 2009 Sergio Pascual 3.7.0-6 +- Reverting soname change + +* Sat Feb 14 2009 Sergio Pascual 3.7.0-5 +- Libray and headers renamed as wcstools + +* Wed Oct 01 2008 Sergio Pascual 3.7.0-4 +- Fails to build from source bz#465061 + +* Wed Oct 01 2008 Sergio Pascual 3.7.0-3 +- Fails to build from source bz#465061 + +* Tue Feb 19 2008 Fedora Release Engineering - 3.7.0-2 +- Autorebuild for GCC 4.3 + +* Wed Sep 05 2007 Sergio Pascual 3.7.0-1 +- New upstream source 3.7.0 + +* Mon Aug 27 2007 Sergio Pascual 3.6.8-2.1 +- Rebuild for Fedora 8 to get the build-id + +* Tue Mar 20 2007 Sergio Pascual 3.6.8-2 +- Fix for bug #232413 + +* Mon Mar 19 2007 Sergio Pascual 3.6.8-1 +- New upstream source 3.6.8 +- Added pacthes to remove warnings during the compilation + +* Mon Feb 26 2007 Sergio Pascual 3.6.7-1 +- New upstream source 3.6.7 + +* Wed Nov 15 2006 Sergio Pascual 3.6.6-1 +- New upstream source 3.6.6 + +* Tue Oct 10 2006 Sergio Pascual 3.6.6-0.1.beta +- New upstream source 3.6.6beta + +* Mon Sep 4 2006 Sergio Pascual 3.6.5-3 +- Rebuild. + +* Wed Aug 30 2006 Sergio Pascual 3.6.5-2 +- Corrected bug in edhead (patch2) (bug #204642). + +* Wed Jun 21 2006 Sergio Pascual 3.6.5-1 +- New upstream source 3.6.5 + +* Tue Jun 13 2006 Sergio Pascual 3.6.4-3 +- Patched overflows in catutil.c and getdate.c +- Patched incompatible pointer in binread.c + +* Mon Jun 12 2006 Sergio Pascual 3.6.4-2 +- Patched edhead. +- libwcs provides libwcs.so.3 +- libwcs into System Environment/Libraries group +- Makefile uses ${RPM_OPT_FLAGS} and $(CC) + +* Fri Jun 09 2006 Sergio Pascual 3.6.4-1 +- Removed not needed ldconfig in wcstools and libwcs-devel. + +* Wed Mar 08 2006 Sergio Pascual 3.6.3-1 +- Initial RPM file. diff --git a/wcstools.spec b/wcstools.spec index 8f024f7..29c1563 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -89,131 +89,4 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog -* Sat Jan 22 2022 Fedora Release Engineering - 3.9.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.9.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 3.9.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.9.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jun 27 2020 Mattia Verga - 3.9.6-1 -- Update to 3.9.6 - -* Fri Jan 31 2020 Fedora Release Engineering - 3.9.5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 3.9.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 3.9.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 3.9.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sat Jun 30 2018 Mattia Verga - 3.9.5-7 -- Remove ldconfig scriptlets - -* Mon Feb 19 2018 Mattia Verga - 3.9.5-6 -- Add gcc to BuildRequires - -* Fri Feb 09 2018 Fedora Release Engineering - 3.9.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 3.9.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 3.9.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat May 20 2017 Mattia Verga - 3.9.5-2 -- Rename remap to wcsremap. See #1450190 - -* Fri Apr 14 2017 Mattia Verga - 3.9.5-1 -- Update to 3.9.5 - -* Sat Feb 11 2017 Fedora Release Engineering - 3.9.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Jan 15 2017 Mattia Verga - 3.9.4-1 -- Update to 3.9.4 - -* Mon Feb 07 2011 Fedora Release Engineering - 3.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Feb 03 2010 Sergio Pascual 3.8.1-1 -- New upstream source -- Patch to fix bz #559863 from upstream - -* Mon Jul 27 2009 Fedora Release Engineering - 3.7.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 3.7.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Feb 19 2009 Sergio Pascual 3.7.0-6 -- Reverting soname change - -* Sat Feb 14 2009 Sergio Pascual 3.7.0-5 -- Libray and headers renamed as wcstools - -* Wed Oct 01 2008 Sergio Pascual 3.7.0-4 -- Fails to build from source bz#465061 - -* Wed Oct 01 2008 Sergio Pascual 3.7.0-3 -- Fails to build from source bz#465061 - -* Tue Feb 19 2008 Fedora Release Engineering - 3.7.0-2 -- Autorebuild for GCC 4.3 - -* Wed Sep 05 2007 Sergio Pascual 3.7.0-1 -- New upstream source 3.7.0 - -* Mon Aug 27 2007 Sergio Pascual 3.6.8-2.1 -- Rebuild for Fedora 8 to get the build-id - -* Tue Mar 20 2007 Sergio Pascual 3.6.8-2 -- Fix for bug #232413 - -* Mon Mar 19 2007 Sergio Pascual 3.6.8-1 -- New upstream source 3.6.8 -- Added pacthes to remove warnings during the compilation - -* Mon Feb 26 2007 Sergio Pascual 3.6.7-1 -- New upstream source 3.6.7 - -* Wed Nov 15 2006 Sergio Pascual 3.6.6-1 -- New upstream source 3.6.6 - -* Tue Oct 10 2006 Sergio Pascual 3.6.6-0.1.beta -- New upstream source 3.6.6beta - -* Mon Sep 4 2006 Sergio Pascual 3.6.5-3 -- Rebuild. - -* Wed Aug 30 2006 Sergio Pascual 3.6.5-2 -- Corrected bug in edhead (patch2) (bug #204642). - -* Wed Jun 21 2006 Sergio Pascual 3.6.5-1 -- New upstream source 3.6.5 - -* Tue Jun 13 2006 Sergio Pascual 3.6.4-3 -- Patched overflows in catutil.c and getdate.c -- Patched incompatible pointer in binread.c - -* Mon Jun 12 2006 Sergio Pascual 3.6.4-2 -- Patched edhead. -- libwcs provides libwcs.so.3 -- libwcs into System Environment/Libraries group -- Makefile uses ${RPM_OPT_FLAGS} and $(CC) - -* Fri Jun 09 2006 Sergio Pascual 3.6.4-1 -- Removed not needed ldconfig in wcstools and libwcs-devel. - -* Wed Mar 08 2006 Sergio Pascual 3.6.3-1 -- Initial RPM file. +%autochangelog From f235efc0673dca540995b91f9b83110c8a089776 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 30 Apr 2022 16:10:48 +0200 Subject: [PATCH 07/20] Update to 3.9.7 (fedora#2079104) --- .gitignore | 1 + sources | 2 +- wcstools-3.9.7_rename-binaries.patch | 36 ++ ...s-3.9.7_rename-libwcs-to-libwcstools.patch | 317 ++++++++++++++++++ wcstools.spec | 51 ++- 5 files changed, 377 insertions(+), 30 deletions(-) create mode 100644 wcstools-3.9.7_rename-binaries.patch create mode 100644 wcstools-3.9.7_rename-libwcs-to-libwcstools.patch diff --git a/.gitignore b/.gitignore index fcfbd92..a79df3d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ wcstools-3.8.1.tar.gz /wcstools-3.9.4.tar.gz /wcstools-3.9.5.tar.gz /wcstools-3.9.6.tar.gz +/wcstools-3.9.7.tar.gz diff --git a/sources b/sources index 4023f26..3c275ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wcstools-3.9.6.tar.gz) = 13e4acf6ab733d7d3e75792d19550e7165b6d1d6e0475ccae6a75a6eef791c53ddad32d1c734930e8fa5218088ad02b1d601ef4c00b16e979ac3febbd5d22716 +SHA512 (wcstools-3.9.7.tar.gz) = a785b87eb8715e6408b463b42f521eaa7b22096346b83b7e76dc068954dd299ef892ac990326b46fef349d9581416dc34d7b1df0fcf41096a4f2c8bf2ed2677b diff --git a/wcstools-3.9.7_rename-binaries.patch b/wcstools-3.9.7_rename-binaries.patch new file mode 100644 index 0000000..f6c947d --- /dev/null +++ b/wcstools-3.9.7_rename-binaries.patch @@ -0,0 +1,36 @@ +diff -udHrN -- b/Makefile c/Makefile +--- b/Makefile 2022-04-30 15:52:57.095131468 +0200 ++++ c/Makefile 2022-04-30 15:55:58.530749638 +0200 +@@ -87,7 +87,7 @@ + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/i2f i2f.c $(LIBS) + + imcat: imcat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imcat imcat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imcatalog imcat.c $(LIBS) + + imfill: imfill.c $(LIBWCS) libwcs/fitsfile.h + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imfill imfill.c $(LIBS) +@@ -153,7 +153,7 @@ + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/newfits newfits.c $(LIBS) + + remap: remap.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/remap remap.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/wcsremap remap.c $(LIBS) + + scat: scat.c $(LIBWCS) libwcs/wcscat.h libwcs/wcs.h + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/scat scat.c $(LIBS) +diff -udHrN -- b/man/man1/imcat.1 c/man/man1/imcat.1 +--- b/man/man1/imcat.1 2016-06-24 22:33:58.000000000 +0200 ++++ c/man/man1/imcat.1 2022-04-30 15:59:00.116431139 +0200 +@@ -1,8 +1,8 @@ +-.TH imcat 1 WCSTools "30 January 2003" ++.TH imcatalog 1 WCSTools "30 January 2003" + .SH Name +-imcat \- List catalog stars in FITS and IRAF image files ++imcatalog \- List catalog stars in FITS and IRAF image files + .SH Synopsis +-imcat [options] FITS or IRAF file(s) ++imcatalog [options] FITS or IRAF file(s) + .SH Description + Search given catalog withing area described by the world coordinate + system in an image header. May be called as imuac to search the USNO A 1.0 diff --git a/wcstools-3.9.7_rename-libwcs-to-libwcstools.patch b/wcstools-3.9.7_rename-libwcs-to-libwcstools.patch new file mode 100644 index 0000000..c147875 --- /dev/null +++ b/wcstools-3.9.7_rename-libwcs-to-libwcstools.patch @@ -0,0 +1,317 @@ +diff -udHrN -- a/libwcs/Makefile b/libwcs/Makefile +--- a/libwcs/Makefile 2011-09-15 21:05:05.000000000 +0200 ++++ b/libwcs/Makefile 2022-04-30 11:32:21.246791512 +0200 +@@ -1,5 +1,4 @@ +-CFLAGS= -g -D_FILE_OFFSET_BITS=64 +-CC= cc ++CFLAGS+= -fPIC + + OBJS = imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \ + fitswcs.o wcsinit.o wcs.o ty2read.o webread.o tmcread.o \ +@@ -11,10 +10,17 @@ + sortstar.o platefit.o iget.o fileutil.o \ + wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o poly.o + +-libwcs.a: $(OBJS) ++all: libwcstools.so.1.0.0 libwcstools.a ++ ++libwcstools.a: $(OBJS) + ar rv $@ $? + ranlib $@ + ++libwcstools.so.1.0.0: $(OBJS) ++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname,libwcstools.so.1 $? -lm ++ ln -s libwcstools.so.1.0.0 libwcstools.so.1 ++ ln -s libwcstools.so.1.0.0 libwcstools.so ++ + actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h + binread.o: wcscat.h wcs.h fitshead.h wcslib.h + ctgread.o: wcscat.h wcs.h fitshead.h wcslib.h +@@ -67,4 +73,4 @@ + worldpos.o: wcs.h fitshead.h wcslib.h + + clean: +- rm -f *.a *.o ++ rm -f *.a *.o *.so *.so.* +diff -udHrN -- a/Makefile b/Makefile +--- a/Makefile 2021-10-12 21:55:01.000000000 +0200 ++++ b/Makefile 2022-04-30 15:52:57.095131468 +0200 +@@ -1,12 +1,11 @@ +-CFLAGS= -g -D_FILE_OFFSET_BITS=64 +-CC= cc +-LIBWCS = libwcs/libwcs.a +-LIBS = $(LIBWCS) -lm ++CC= gcc ++LIBWCS = libwcs/libwcstools.so ++LIBS = -L libwcs -lwcstools -lm + #LIBS = $(LIBWCS) -lm -lnsl -lsocket + BIN = bin + .PRECIOUS: ${LIBWCS} ${LIBNED} + .c.o: +- $(CC) -c $(CFLAGS) $(DEFS) $< ++ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $< + + all: cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \ + imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \ +@@ -16,196 +15,195 @@ + isfile simpos bincat + + addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) + + bincat: bincat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/bincat bincat.c $(LIBS) + + char2sp: char2sp.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS) + + conpix: conpix.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/conpix conpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/conpix conpix.c $(LIBS) + + cphead: cphead.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/cphead cphead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/cphead cphead.c $(LIBS) + + crlf: crlf.c +- $(CC) $(CFLAGS) -o $(BIN)/crlf crlf.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/crlf crlf.c + + delwcs: delwcs.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/delwcs delwcs.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/delwcs delwcs.c $(LIBS) + + delhead: delhead.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/delhead delhead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/delhead delhead.c $(LIBS) + + edhead: edhead.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/edhead edhead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/edhead edhead.c $(LIBS) + + filename: filename.c +- $(CC) $(CFLAGS) -o $(BIN)/filename filename.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filename filename.c + + filedir: filedir.c +- $(CC) $(CFLAGS) -o $(BIN)/filedir filedir.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filedir filedir.c + + fileroot: fileroot.c +- $(CC) $(CFLAGS) -o $(BIN)/fileroot fileroot.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/fileroot fileroot.c + + filext: filext.c +- $(CC) $(CFLAGS) -o $(BIN)/filext filext.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filext filext.c + + fixhead: fixhead.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/fixhead fixhead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/fixhead fixhead.c $(LIBS) + + fixpix: fixpix.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/fixpix fixpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/fixpix fixpix.c $(LIBS) + + getcol: getcol.c $(LIBWCS) libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/getcol getcol.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getcol getcol.c $(LIBS) + + getdate: getdate.c $(LIBWCS) libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/getdate getdate.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getdate getdate.c $(LIBS) + + gethead: gethead.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/gethead gethead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gethead gethead.c $(LIBS) + + getfits: getfits.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/getfits getfits.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getfits getfits.c $(LIBS) + + getpix: getpix.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/getpix getpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getpix getpix.c $(LIBS) + + gettab: gettab.c $(LIBWCS) libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/gettab gettab.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gettab gettab.c $(LIBS) + + httpget: httpget.c $(LIBWCS) libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/httpget httpget.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/httpget httpget.c $(LIBS) + + htmlsp: htmlsp.c +- $(CC) $(CFLAGS) -o $(BIN)/htmlsp htmlsp.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/htmlsp htmlsp.c + + i2f: i2f.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/i2f i2f.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/i2f i2f.c $(LIBS) + + imcat: imcat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/imcat imcat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imcat imcat.c $(LIBS) + + imfill: imfill.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/imfill imfill.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imfill imfill.c $(LIBS) + + imresize: imresize.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/imresize imresize.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imresize imresize.c $(LIBS) + + imsmooth: imsmooth.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/imsmooth imsmooth.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imsmooth imsmooth.c $(LIBS) + + imhead: imhead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/imhead imhead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imhead imhead.c $(LIBS) + + imrot: imrot.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/imrot imrot.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imrot imrot.c $(LIBS) + + imsize: imsize.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/imsize imsize.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imsize imsize.c $(LIBS) + + imstack: imstack.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/imstack imstack.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imstack imstack.c $(LIBS) + + imextract: imextract.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/imextract imextract.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imextract imextract.c $(LIBS) + + imstar: imstar.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h libwcs/lwcs.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/imstar imstar.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imstar imstar.c $(LIBS) + + isfile: isfile.c $(LIBWCS) libwcs/fitshead.h +- $(CC) $(CFLAGS) -o $(BIN)/isfile isfile.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isfile isfile.c $(LIBS) + + isfits: isfits.c $(LIBWCS) libwcs/fitshead.h +- $(CC) $(CFLAGS) -o $(BIN)/isfits isfits.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isfits isfits.c $(LIBS) + + isnum: isnum.c $(LIBWCS) libwcs/fitshead.h +- $(CC) $(CFLAGS) -o $(BIN)/isnum isnum.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isnum isnum.c $(LIBS) + + isdate: isdate.c $(LIBWCS) libwcs/fitshead.h +- $(CC) $(CFLAGS) -o $(BIN)/isdate isdate.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isdate isdate.c $(LIBS) + + isimlist: isimlist.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/isimlist isimlist.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isimlist isimlist.c $(LIBS) + + isrange: isrange.c +- $(CC) $(CFLAGS) -o $(BIN)/isrange isrange.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isrange isrange.c + + imwcs: imwcs.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h +- $(CC) $(CFLAGS) -o $(BIN)/imwcs imwcs.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imwcs imwcs.c $(LIBS) + + immatch: immatch.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h +- $(CC) $(CFLAGS) -o $(BIN)/immatch immatch.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/immatch immatch.c $(LIBS) + + immwcs: immwcs.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h +- $(CC) $(CFLAGS) -o $(BIN)/immwcs immwcs.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/immwcs immwcs.c $(LIBS) + + keyhead: keyhead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/keyhead keyhead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/keyhead keyhead.c $(LIBS) + + matchcat: matchcat.c $(LIBWCS) libwcs/wcscat.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS) + + newfits: newfits.c $(LIBWCS) libwcs/fitshead.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/newfits newfits.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/newfits newfits.c $(LIBS) + + remap: remap.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/remap remap.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/remap remap.c $(LIBS) + + scat: scat.c $(LIBWCS) libwcs/wcscat.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/scat scat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/scat scat.c $(LIBS) + + sethead: sethead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/sethead sethead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sethead sethead.c $(LIBS) + + setpix: setpix.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/setpix setpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/setpix setpix.c $(LIBS) + + sky2xy: sky2xy.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/sky2xy sky2xy.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sky2xy sky2xy.c $(LIBS) + + skycoor: skycoor.c $(LIBWCS) libwcs/wcs.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/skycoor skycoor.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/skycoor skycoor.c $(LIBS) + + sp2char: sp2char.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS) + + subpix: subpix.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/subpix subpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/subpix subpix.c $(LIBS) + + sumpix: sumpix.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/sumpix sumpix.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sumpix sumpix.c $(LIBS) + + wcshead: wcshead.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/wcshead wcshead.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/wcshead wcshead.c $(LIBS) + + xy2sky: xy2sky.c $(LIBWCS) libwcs/wcs.h libwcs/wcscat.h +- $(CC) $(CFLAGS) -o $(BIN)/xy2sky xy2sky.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/xy2sky xy2sky.c $(LIBS) + +-simpos: simpos.c libwcs/libwcs.a +- $(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(LIBS) ++simpos: simpos.c $(LIBWCS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/simpos simpos.c $(LIBS) + + gsc2cat: gsc2cat.c $(LIBWCS) +- $(CC) $(CFLAGS) -o $(BIN)/gsc2cat gsc2cat.c $(LIBS) ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gsc2cat gsc2cat.c $(LIBS) + + tmcat: tmcat.c +- $(CC) $(CFLAGS) -o $(BIN)/tmcat tmcat.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/tmcat tmcat.c + + tmcate: tmcate.c +- $(CC) $(CFLAGS) -o $(BIN)/tmcate tmcate.c ++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/tmcate tmcate.c + + $(LIBWCS): libwcs/*.c libwcs/*.h +- cd libwcs; make ++ $(MAKE) CC=$(CC) -C libwcs + + objclean: +- cd libwcs; make clean ++ $(MAKE) -C libwcs clean + + binclean: + rm -f ./bin/* + +-clean: +- make objclean; make binclean ++clean: objclean binclean diff --git a/wcstools.spec b/wcstools.spec index 29c1563..fcb1cbd 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,17 +1,22 @@ -Name: wcstools -Version: 3.9.6 -Release: 5%{?dist} -Summary: Software utilities to display and manipulate the WCS of a FITS image -License: GPLv2+ -URL: http://tdc-www.harvard.edu/wcstools -Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz +Name: wcstools +Version: 3.9.7 +Release: %autorelease +Summary: Software utilities to display and manipulate the WCS of a FITS image +License: GPLv2+ +URL: http://tdc-www.harvard.edu/wcstools +Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: gcc -# Patch from Debian to create shared lib and rename it to avoid +# Patch adjusted from Debian to create shared lib and rename it to avoid # conflicts with Mark Calabretta's wcslib package. -Patch0: wcstools-3.9.6-rename-shlib.patch +Patch: wcstools-3.9.7_rename-libwcs-to-libwcstools.patch + +# Patch to rename some conflicting binaries +# new names in accordance to Debian renaming +# see also fedora#1450190 +Patch: wcstools-3.9.7_rename-binaries.patch %description Wcstools is a set of software utilities, written in C, which create, @@ -22,23 +27,22 @@ search star catalogs and manipulate images. %package libs -Summary: Wcstools shared library -License: LGPLv2+ +Summary: Wcstools shared library +License: LGPLv2+ %description libs Shared library necessary to run wcstools and programs based on libwcs. %package devel -Summary: Libraries, includes, etc. used to develop an application with wcstools -License: LGPLv2+ -Requires: %{name}-libs%{_isa} = %{version}-%{release} +Summary: Libraries, includes, etc. used to develop an application with wcstools +License: LGPLv2+ +Requires: %{name}-libs%{_isa} = %{version}-%{release} %description devel This are the files needed to develop an application using wcstools. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 # Fix wrong FSF address in source headers # asked upstream by mail to fix this @@ -46,13 +50,8 @@ grep -rl '59 Temple Place, Suite 330, Boston, MA 02111-1307 USA' --include=*.{ %build -CFLAGS="$RPM_OPT_FLAGS" -CPPFLAGS="$RPM_OPT_FLAGS" -export CFLAGS -export CPPFLAGS +%make_build -# Parallel build fails -make %install %{__mkdir_p} %{buildroot}%{_libdir} @@ -60,12 +59,6 @@ make %{__mkdir_p} %{buildroot}%{_includedir}/wcs %{__mkdir_p} %{buildroot}%{_mandir}/man1 %{__install} -p bin/* %{buildroot}%{_bindir} - -# Rename conflicting binary bug #1450190 -# Mailed upstream, no response -# Debian uses the same rename -mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap - %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} %{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs %{__install} -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1 From c7a043997c42137ddf6472598a8959ce6418d694 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 7 May 2022 16:14:26 +0200 Subject: [PATCH 08/20] Use correct CFLAGS in epel and Fedora<36 --- wcstools.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wcstools.spec b/wcstools.spec index fcb1cbd..ebc8bd6 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -50,6 +50,13 @@ grep -rl '59 Temple Place, Suite 330, Boston, MA 02111-1307 USA' --include=*.{ %build +%if 0%{?epel} || 0%{?fedora} < 36 +CFLAGS="$RPM_OPT_FLAGS" +CPPFLAGS="$RPM_OPT_FLAGS" +export CFLAGS +export CPPFLAGS +%endif + %make_build From f71e2ae76c04d9aa5c254e348eda43ad4b4f5d02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:16:30 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 731ac205233168ffdaf910e8eae2608a7e3e05a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:40:31 +0000 Subject: [PATCH 10/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 35b5bc544c0a16973a13ae74e76972a64946f907 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:02:46 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 76cf69c5fdfc1c545b0dea306c9173b28d2254a9 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 10 Sep 2023 10:04:58 +0200 Subject: [PATCH 12/20] Migrate to SPDX license --- wcstools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index ebc8bd6..c52c689 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -2,7 +2,7 @@ Name: wcstools Version: 3.9.7 Release: %autorelease Summary: Software utilities to display and manipulate the WCS of a FITS image -License: GPLv2+ +License: GPL-2.0-or-later URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz From d962d53fe036492aeb478780dfc13cd6b954592d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:30:24 +0000 Subject: [PATCH 13/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 39ea7475974a288fd54d16bf7cbc1937190581a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:11:37 +0000 Subject: [PATCH 14/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1fabb8db27e9f570ae649b769710703065442ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 17 Jan 2025 23:09:07 +0000 Subject: [PATCH 15/20] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- wcstools.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index c52c689..df20497 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -27,8 +27,10 @@ search star catalogs and manipulate images. %package libs -Summary: Wcstools shared library -License: LGPLv2+ +Summary: Wcstools shared library +# most files have LGPL-2.0-or-later header +# COPYING is LGPL-2.1-only +License: LGPL-2.0-or-later AND LGPL-2.1-only %description libs Shared library necessary to run wcstools and programs based on libwcs. @@ -36,7 +38,7 @@ Shared library necessary to run wcstools and programs based on libwcs. %package devel Summary: Libraries, includes, etc. used to develop an application with wcstools -License: LGPLv2+ +License: LGPL-2.0-or-later AND LGPL-2.1-only Requires: %{name}-libs%{_isa} = %{version}-%{release} %description devel This are the files needed to develop an application using wcstools. From 25d4df0ff43176a8ddfc3092e5e31cf37aa5cff7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:50:19 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From c640cf41433502ddf4de590c893c5b3afdbb9588 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Thu, 30 Jan 2025 18:53:24 +0100 Subject: [PATCH 17/20] Fix build with GCC15 (Fedora#2341527) --- fix_gcc15-c++23.patch | 54 +++++++++++++++++++++++++++++++++++++++++++ wcstools.spec | 16 +++++++------ 2 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 fix_gcc15-c++23.patch diff --git a/fix_gcc15-c++23.patch b/fix_gcc15-c++23.patch new file mode 100644 index 0000000..9ee1bdf --- /dev/null +++ b/fix_gcc15-c++23.patch @@ -0,0 +1,54 @@ +diff -U 3 -dHrN a/libwcs/dateutil.c b/libwcs/dateutil.c +--- a/libwcs/dateutil.c 2021-09-15 23:45:06.000000000 +0200 ++++ b/libwcs/dateutil.c 2025-01-24 09:38:40.402443820 +0100 +@@ -314,6 +314,8 @@ + * Return Mod of floating point number + */ + ++#define _GNU_SOURCE ++ + #include + #include + #include +diff -U 3 -dHrN a/libwcs/imgetwcs.c b/libwcs/imgetwcs.c +--- a/libwcs/imgetwcs.c 2016-06-24 21:23:06.000000000 +0200 ++++ b/libwcs/imgetwcs.c 2025-01-24 09:40:12.971028438 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + #include "wcs.h" + #include "lwcs.h" +diff -U 3 -dHrN a/libwcs/webread.c b/libwcs/webread.c +--- a/libwcs/webread.c 2022-02-04 22:08:59.000000000 +0100 ++++ b/libwcs/webread.c 2025-01-24 09:37:25.750042386 +0100 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + #include "wcs.h" +@@ -976,7 +977,7 @@ + memset(adrinet, 0, sizeof(struct sockaddr_in)); + adrinet->sin_family = AF_INET; + adrinet->sin_port = htons(port); +- memcpy(&adrinet->sin_addr, hp->h_addr, hp->h_length); ++ memcpy(&adrinet->sin_addr, hp->h_addr_list[0], hp->h_length); + + return type; + } +diff -U 3 -dHrN a/Makefile b/Makefile +--- a/Makefile 2025-01-22 08:49:29.246196532 +0100 ++++ b/Makefile 2025-01-24 09:31:30.842906462 +0100 +@@ -1,4 +1,7 @@ + CC= gcc ++ ++CFLAGS += -std=c99 -D_XOPEN_SOURCE=500 ++ + LIBWCS = libwcs/libwcstools.so + LIBS = -L libwcs -lwcstools -lm + #LIBS = $(LIBWCS) -lm -lnsl -lsocket diff --git a/wcstools.spec b/wcstools.spec index df20497..a37b8d0 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,3 +1,8 @@ +# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval +ExcludeArch: %{ix86} + +%global build_type_safety_c 0 + Name: wcstools Version: 3.9.7 Release: %autorelease @@ -18,6 +23,10 @@ Patch: wcstools-3.9.7_rename-libwcs-to-libwcstools.patch # see also fedora#1450190 Patch: wcstools-3.9.7_rename-binaries.patch +# Since there's no way to reach out upstream other than email +# and I don't get replies, this patch tries to fix build with GCC15 +Patch: fix_gcc15-c++23.patch + %description Wcstools is a set of software utilities, written in C, which create, display and manipulate the world coordinate system of a FITS or IRAF @@ -52,13 +61,6 @@ grep -rl '59 Temple Place, Suite 330, Boston, MA 02111-1307 USA' --include=*.{ %build -%if 0%{?epel} || 0%{?fedora} < 36 -CFLAGS="$RPM_OPT_FLAGS" -CPPFLAGS="$RPM_OPT_FLAGS" -export CFLAGS -export CPPFLAGS -%endif - %make_build From 323c0ccdacf57a0942c711047a84d47be35f6853 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:19:51 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8c43bcded3e96d97feb4c5353cffea5197893d8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:09:25 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 39a7d0a67c26023d66196b3fc1e2541901fac824 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:43:51 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild