From c66102205062ac2599b8bad4a2db415885546e63 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 26 Jun 2006 17:27:53 +0000 Subject: [PATCH 01/62] auto-import wcstools-3.6.5-1 on branch devel from wcstools-3.6.5-1.src.rpm --- .cvsignore | 1 + sources | 1 + wcstools.spec | 98 ++++++++++++++++++++++++++++++++++++++++ wcstools3-codewarn.patch | 36 +++++++++++++++ wcstools3-shared.patch | 83 ++++++++++++++++++++++++++++++++++ 5 files changed, 219 insertions(+) create mode 100644 wcstools.spec create mode 100644 wcstools3-codewarn.patch create mode 100644 wcstools3-shared.patch diff --git a/.cvsignore b/.cvsignore index e69de29..1dcc290 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +wcstools-3.6.5.tar.gz diff --git a/sources b/sources index e69de29..d3540f2 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9cd9bbbe1408c2d92728d8f039291fb3 wcstools-3.6.5.tar.gz diff --git a/wcstools.spec b/wcstools.spec new file mode 100644 index 0000000..63b77dd --- /dev/null +++ b/wcstools.spec @@ -0,0 +1,98 @@ +Name: wcstools +Version: 3.6.5 +Release: 1%{?dist} +Summary: Software utilities to display and manipulate the WCS of a FITS image + +Group: Applications/Engineering +License: GPL +URL: http://tdc-www.harvard.edu/wcstools +Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz +Patch0: wcstools3-shared.patch +Patch1: wcstools3-codewarn.patch +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +%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 +image, using specific keywords in the image header which relate pixel +position within the image to position on the sky. Auxillary programs +search star catalogs and manipulate images. + +%package -n libwcs +Summary: Libwcs shared library +Group: System Environment/Libraries +License: LGPL + +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description -n libwcs +Shared library necessary to run wcstools and programs based on libwcs. + +%package -n libwcs-devel +Summary: Libraries, includes, etc. used to develop an application with libwcs +Group: Development/Libraries +License: LGPL +Requires: %{name} = %{version}-%{release} +%description -n libwcs-devel +This are the files needed to develop an application using libwcs. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all + +%install +%{__rm} -rf %{buildroot} +%{__mkdir_p} %{buildroot}%{_libdir} +%{__mkdir_p} %{buildroot}%{_bindir} +%{__mkdir_p} %{buildroot}%{_includedir}/wcs +%{__mkdir_p} %{buildroot}%{_mandir}/man1 +%{__install} -p bin/* %{buildroot}%{_bindir} +%{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} +%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs +%{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1 + +%clean +%{__rm} -fr %{buildroot} + +%post -n libwcs -p /sbin/ldconfig + +%postun -n libwcs -p /sbin/ldconfig + +%files +%doc NEWS COPYING Readme Programs +%defattr(-,root,root) +%{_bindir}/* +%{_mandir}/man1/* + +%files -n libwcs +%defattr(-,root,root) +%{_libdir}/*.so.* + +%files -n libwcs-devel +%doc libwcs/COPYING libwcs/NEWS +%defattr(-,root,root) +%{_libdir}/*.so +%{_includedir}/wcs + + +%changelog +* Fri 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/wcstools3-codewarn.patch b/wcstools3-codewarn.patch new file mode 100644 index 0000000..4dbdf80 --- /dev/null +++ b/wcstools3-codewarn.patch @@ -0,0 +1,36 @@ +diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c +--- wcstools-3.6.5.orig/getdate.c 2006-06-22 01:46:49.000000000 +0200 ++++ wcstools-3.6.5/getdate.c 2006-06-23 10:23:36.000000000 +0200 +@@ -382,7 +382,7 @@ + char outform[16]; + char *fitsdate, *newfdate; + char temp[64]; +- char ts0[8]; ++ char ts0[9]; + char *tchar; + int its, its1; + time_t lts; +diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c +--- wcstools-3.6.5.orig/libwcs/binread.c 2006-06-20 22:07:37.000000000 +0200 ++++ wcstools-3.6.5/libwcs/binread.c 2006-06-23 10:24:39.000000000 +0200 +@@ -1358,7 +1358,7 @@ + for (i = 0; i < nmag; i++) { + moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2); + if (sc->byteswapped) +- binswap2 (&st->mag[i], 2); ++ binswap2 ((char*)&st->mag[i], 2); + st->xmag[i] = 0.01 * (double) st->mag[i]; + } + } +diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c +--- wcstools-3.6.5.orig/libwcs/catutil.c 2006-06-20 21:05:14.000000000 +0200 ++++ wcstools-3.6.5/libwcs/catutil.c 2006-06-23 10:29:31.000000000 +0200 +@@ -722,7 +722,7 @@ + lname = 0; + else + lname = strlen (refcatname); +- catname = (char *)calloc (lname + 16, 1); ++ catname = (char *)calloc (lname + 37, 1); + if (lname > 0) + sprintf (catname, "%s sources", refcatname); + else diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch new file mode 100644 index 0000000..97427f5 --- /dev/null +++ b/wcstools3-shared.patch @@ -0,0 +1,83 @@ +diff -ur wcstools-3.6.4.orig/libwcs/Makefile wcstools-3.6.4/libwcs/Makefile +--- wcstools-3.6.4.orig/libwcs/Makefile 2006-04-19 22:10:07.000000000 +0200 ++++ wcstools-3.6.4/libwcs/Makefile 2006-06-12 13:24:01.000000000 +0200 +@@ -1,5 +1,4 @@ +-CFLAGS= -g +-CC= cc ++CFLAGS = + + 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 polfit.o \ + wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o + ++all: libwcs.a libwcs.so.3.0.0 ++ + libwcs.a: $(OBJS) + ar rv $@ $? + ranlib $@ + ++libwcs.so.3.0.0: $(OBJS) ++ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcs.so.3 $? ++ ln -s libwcs.so.3.0.0 libwcs.so.3 ++ ln -s libwcs.so.3.0.0 libwcs.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 +@@ -65,4 +71,4 @@ + worldpos.o: wcs.h fitshead.h wcslib.h + + clean: +- rm -f *.a *.o ++ rm -f *.a *.o *.so* +diff -ur wcstools-3.6.4.orig/Makefile wcstools-3.6.4/Makefile +--- wcstools-3.6.4.orig/Makefile 2006-04-26 00:14:19.000000000 +0200 ++++ wcstools-3.6.4/Makefile 2006-06-12 13:19:10.000000000 +0200 +@@ -1,8 +1,5 @@ +-CFLAGS= -g +-CC= cc +-LIBWCS = libwcs/libwcs.a +-LIBS = $(LIBWCS) -lm +-#CATLIBS = $(LIBS) -lnsl -lsocket ++LIBWCS = libwcs/libwcs.so ++LIBS = -L./libwcs -lwcs -lm + CATLIBS = $(LIBS) + BIN = bin + .PRECIOUS: ${LIBWCS} +@@ -22,7 +19,7 @@ + $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(CATLIBS) + + char2sp: char2sp.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS) ++ $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBS) + + conpix: conpix.c $(LIBWCS) libwcs/fitsfile.h + $(CC) $(CFLAGS) -o $(BIN)/conpix conpix.c $(LIBS) +@@ -151,7 +148,7 @@ + $(CC) $(CFLAGS) -o $(BIN)/skycoor skycoor.c $(CATLIBS) + + sp2char: sp2char.c $(LIBWCS) libwcs/fitsfile.h +- $(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS) ++ $(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBS) + + subpix: subpix.c $(LIBWCS) libwcs/fitsfile.h + $(CC) $(CFLAGS) -o $(BIN)/subpix subpix.c $(LIBS) +@@ -169,13 +166,13 @@ + $(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(CATLIBS) + + $(LIBWCS): libwcs/*.c libwcs/*.h +- cd libwcs; make ++ $(MAKE) -C libwcs + + objclean: +- cd libwcs; make clean ++ $(MAKE) -C libwcs clean + + binclean: + rm -f ./bin/* + + clean: +- make objclean; make binclean ++ $(MAKE) objclean; $(MAKE) binclean From 916ec0961a3b4e1777eb982a0c2c1d849c2a3baf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 27 Aug 2006 21:14:21 +0000 Subject: [PATCH 02/62] http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild --- needs.rebuild | 1 + 1 file changed, 1 insertion(+) create mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 57ddebf17a8246acf6ad7f0c1680163610ad4708 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Tue, 29 Aug 2006 00:13:22 +0000 Subject: [PATCH 03/62] Successful rebuild for FE6 --- needs.rebuild | 1 - 1 file changed, 1 deletion(-) delete mode 100644 needs.rebuild diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild From 31ed202a1981ddf0e0a08e6bc9c489e490842614 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 4 Sep 2006 11:22:17 +0000 Subject: [PATCH 04/62] - Corrected bug in edhead (patch2) (bug #204642). Fri 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. --- wcstools.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 63b77dd..52f08cf 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -9,6 +9,7 @@ URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch +Patch2: wcstools3-tmpfile.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,6 +43,7 @@ This are the files needed to develop an application using libwcs. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all @@ -82,6 +84,8 @@ This are the files needed to develop an application using libwcs. %changelog +* Wed Aug 30 2006 Sergio Pascual 3.6.5-2 +- Corrected bug in edhead (patch2) (bug #204642). * Fri 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 From 4c5317a33ff98ce0fdfdfdc8f4a81895a37edc38 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 4 Sep 2006 11:24:10 +0000 Subject: [PATCH 05/62] Patch for edhead bug --- wcstools3-tmpfile.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 wcstools3-tmpfile.patch diff --git a/wcstools3-tmpfile.patch b/wcstools3-tmpfile.patch new file mode 100644 index 0000000..c19139d --- /dev/null +++ b/wcstools3-tmpfile.patch @@ -0,0 +1,12 @@ +diff -ur wcstools-3.6.5.orig/edhead.c wcstools-3.6.5/edhead.c +--- wcstools-3.6.5.orig/edhead.c 2006-06-22 01:45:55.000000000 +0200 ++++ wcstools-3.6.5/edhead.c 2006-08-30 23:31:26.000000000 +0200 +@@ -140,7 +140,7 @@ + char headline[160]; + char newname[128]; + char space; +- char *temphead = "/tmp/edheadXXXXXX"; ++ char temphead[] = "/tmp/edheadXXXXXX"; + FILE *fd; + char *ext, *fname, *imext, *imext1; + char *editcom; From b2d4d4444c718ccb4ccb7b937c65063e7a4373da Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 4 Sep 2006 14:22:40 +0000 Subject: [PATCH 06/62] - Rebuild. Wed Aug 30 2006 Sergio Pascual 3.6.5-2 - Corrected bug in edhead (patch2) (bug #204642). Fri 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. --- wcstools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 52f08cf..bdf2c2c 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -84,6 +84,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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). * Fri Jun 21 2006 Sergio Pascual 3.6.5-1 From 6f8aa5484a80cef29361b27ac5bfd424020fe93b Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Tue, 10 Oct 2006 11:28:24 +0000 Subject: [PATCH 07/62] - 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). Fri 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. --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 14 +++++++------- wcstools3-codewarn.patch | 23 +++++++++++------------ wcstools3-tmpfile.patch | 12 ------------ 5 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 wcstools3-tmpfile.patch diff --git a/.cvsignore b/.cvsignore index 1dcc290..1185551 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.5.tar.gz +wcstools-3.6.6beta.tar.gz diff --git a/sources b/sources index d3540f2..4b6ad72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cd9bbbe1408c2d92728d8f039291fb3 wcstools-3.6.5.tar.gz +cc7bdf13772282618c094d4baf54e800 wcstools-3.6.6beta.tar.gz diff --git a/wcstools.spec b/wcstools.spec index bdf2c2c..88bb09e 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,18 +1,16 @@ Name: wcstools -Version: 3.6.5 -Release: 3%{?dist} +Version: 3.6.6 +Release: 0.1.beta%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering License: GPL URL: http://tdc-www.harvard.edu/wcstools -Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz +Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch -Patch2: wcstools3-tmpfile.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - %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 @@ -35,7 +33,7 @@ Shared library necessary to run wcstools and programs based on libwcs. Summary: Libraries, includes, etc. used to develop an application with libwcs Group: Development/Libraries License: LGPL -Requires: %{name} = %{version}-%{release} +Requires: libwcs = %{version}-%{release} %description -n libwcs-devel This are the files needed to develop an application using libwcs. @@ -43,7 +41,6 @@ This are the files needed to develop an application using libwcs. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all @@ -74,6 +71,7 @@ This are the files needed to develop an application using libwcs. %files -n libwcs %defattr(-,root,root) +%doc libwcs/COPYING %{_libdir}/*.so.* %files -n libwcs-devel @@ -84,6 +82,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch index 4dbdf80..a619358 100644 --- a/wcstools3-codewarn.patch +++ b/wcstools3-codewarn.patch @@ -1,18 +1,17 @@ -diff -ur wcstools-3.6.5.orig/getdate.c wcstools-3.6.5/getdate.c ---- wcstools-3.6.5.orig/getdate.c 2006-06-22 01:46:49.000000000 +0200 -+++ wcstools-3.6.5/getdate.c 2006-06-23 10:23:36.000000000 +0200 -@@ -382,7 +382,7 @@ - char outform[16]; - char *fitsdate, *newfdate; ++++ wcstools-3.6.6/getdate.c 2006-10-10 12:07:22.000000000 +0200 +--- wcstools-3.6.6.orig/getdate.c 2006-10-10 12:06:11.000000000 +0200 +@@ -413,7 +413,7 @@ + char *fitsdate, *newfdate, *stdate; char temp[64]; + char fyear[16]; - char ts0[8]; + char ts0[9]; char *tchar; int its, its1; time_t lts; -diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c ---- wcstools-3.6.5.orig/libwcs/binread.c 2006-06-20 22:07:37.000000000 +0200 -+++ wcstools-3.6.5/libwcs/binread.c 2006-06-23 10:24:39.000000000 +0200 +diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c +--- wcstools-3.6.6.orig/libwcs/binread.c 2006-10-10 12:10:47.000000000 +0200 ++++ wcstools-3.6.6/libwcs/binread.c 2006-10-10 12:11:22.000000000 +0200 @@ -1358,7 +1358,7 @@ for (i = 0; i < nmag; i++) { moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2); @@ -22,9 +21,9 @@ diff -ur wcstools-3.6.5.orig/libwcs/binread.c wcstools-3.6.5/libwcs/binread.c st->xmag[i] = 0.01 * (double) st->mag[i]; } } -diff -ur wcstools-3.6.5.orig/libwcs/catutil.c wcstools-3.6.5/libwcs/catutil.c ---- wcstools-3.6.5.orig/libwcs/catutil.c 2006-06-20 21:05:14.000000000 +0200 -+++ wcstools-3.6.5/libwcs/catutil.c 2006-06-23 10:29:31.000000000 +0200 +diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c +--- wcstools-3.6.6.orig/libwcs/catutil.c 2006-10-10 12:10:47.000000000 +0200 ++++ wcstools-3.6.6/libwcs/catutil.c 2006-10-10 12:12:08.000000000 +0200 @@ -722,7 +722,7 @@ lname = 0; else diff --git a/wcstools3-tmpfile.patch b/wcstools3-tmpfile.patch deleted file mode 100644 index c19139d..0000000 --- a/wcstools3-tmpfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur wcstools-3.6.5.orig/edhead.c wcstools-3.6.5/edhead.c ---- wcstools-3.6.5.orig/edhead.c 2006-06-22 01:45:55.000000000 +0200 -+++ wcstools-3.6.5/edhead.c 2006-08-30 23:31:26.000000000 +0200 -@@ -140,7 +140,7 @@ - char headline[160]; - char newname[128]; - char space; -- char *temphead = "/tmp/edheadXXXXXX"; -+ char temphead[] = "/tmp/edheadXXXXXX"; - FILE *fd; - char *ext, *fname, *imext, *imext1; - char *editcom; From 03e79c415b2de10b601a3953544a46ed2ba61219 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Wed, 15 Nov 2006 19:17:37 +0000 Subject: [PATCH 08/62] - 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). Fri 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. --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1185551..cbe2684 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.6beta.tar.gz +wcstools-3.6.6.tar.gz diff --git a/sources b/sources index 4b6ad72..22a5755 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc7bdf13772282618c094d4baf54e800 wcstools-3.6.6beta.tar.gz +c41af2de22949f40957276978f48e0d7 wcstools-3.6.6.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 88bb09e..9065e01 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,12 +1,12 @@ Name: wcstools Version: 3.6.6 -Release: 0.1.beta%{?dist} +Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering License: GPL URL: http://tdc-www.harvard.edu/wcstools -Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-3.6.6beta.tar.gz +Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -82,6 +82,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 From 5977c7e6393702d90ce81072ba22a0ce983fdaff Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 26 Feb 2007 15:11:22 +0000 Subject: [PATCH 09/62] - 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). Fri 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. --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 4 +++- wcstools3-shared.patch | 48 ++++++++++++++++++++++++------------------ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index cbe2684..0182805 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.6.tar.gz +wcstools-3.6.7.tar.gz diff --git a/sources b/sources index 22a5755..a907d32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c41af2de22949f40957276978f48e0d7 wcstools-3.6.6.tar.gz +301be6880e514b7d66997375550fb708 wcstools-3.6.7.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 9065e01..6b84e63 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,5 +1,5 @@ Name: wcstools -Version: 3.6.6 +Version: 3.6.7 Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image @@ -82,6 +82,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index 97427f5..ef5ff24 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -1,15 +1,16 @@ -diff -ur wcstools-3.6.4.orig/libwcs/Makefile wcstools-3.6.4/libwcs/Makefile ---- wcstools-3.6.4.orig/libwcs/Makefile 2006-04-19 22:10:07.000000000 +0200 -+++ wcstools-3.6.4/libwcs/Makefile 2006-06-12 13:24:01.000000000 +0200 -@@ -1,5 +1,4 @@ +diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile +--- wcstools-3.6.7.old/libwcs/Makefile 2007-01-10 20:26:36.000000000 +0100 ++++ wcstools-3.6.7/libwcs/Makefile 2007-02-26 15:42:32.000000000 +0100 +@@ -1,5 +1,5 @@ -CFLAGS= -g --CC= cc -+CFLAGS = +-CC= cc -Wall ++ ++ 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 polfit.o \ +@@ -11,10 +11,18 @@ + sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o +all: libwcs.a libwcs.so.3.0.0 @@ -22,32 +23,37 @@ diff -ur wcstools-3.6.4.orig/libwcs/Makefile wcstools-3.6.4/libwcs/Makefile + $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcs.so.3 $? + ln -s libwcs.so.3.0.0 libwcs.so.3 + ln -s libwcs.so.3.0.0 libwcs.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 -@@ -65,4 +71,4 @@ +@@ -64,4 +72,4 @@ worldpos.o: wcs.h fitshead.h wcslib.h clean: - rm -f *.a *.o + rm -f *.a *.o *.so* -diff -ur wcstools-3.6.4.orig/Makefile wcstools-3.6.4/Makefile ---- wcstools-3.6.4.orig/Makefile 2006-04-26 00:14:19.000000000 +0200 -+++ wcstools-3.6.4/Makefile 2006-06-12 13:19:10.000000000 +0200 -@@ -1,8 +1,5 @@ +--- wcstools-3.6.7.old/Makefile 2007-01-10 20:38:20.000000000 +0100 ++++ wcstools-3.6.7/Makefile 2007-02-26 15:55:19.000000000 +0100 +@@ -1,7 +1,7 @@ -CFLAGS= -g --CC= cc +-CC= cc -Wall -LIBWCS = libwcs/libwcs.a -LIBS = $(LIBWCS) -lm --#CATLIBS = $(LIBS) -lnsl -lsocket ++#CFLAGS= -g ++#CC= cc -Wall +LIBWCS = libwcs/libwcs.so +LIBS = -L./libwcs -lwcs -lm + #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) BIN = bin - .PRECIOUS: ${LIBWCS} -@@ -22,7 +19,7 @@ - $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(CATLIBS) +@@ -19,10 +19,10 @@ + $(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) + + bincat: bincat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h +- $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(CATLIBS) ++ $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(LIBS) char2sp: char2sp.c $(LIBWCS) libwcs/fitsfile.h - $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS) @@ -55,7 +61,7 @@ diff -ur wcstools-3.6.4.orig/Makefile wcstools-3.6.4/Makefile conpix: conpix.c $(LIBWCS) libwcs/fitsfile.h $(CC) $(CFLAGS) -o $(BIN)/conpix conpix.c $(LIBS) -@@ -151,7 +148,7 @@ +@@ -151,7 +151,7 @@ $(CC) $(CFLAGS) -o $(BIN)/skycoor skycoor.c $(CATLIBS) sp2char: sp2char.c $(LIBWCS) libwcs/fitsfile.h @@ -64,12 +70,12 @@ diff -ur wcstools-3.6.4.orig/Makefile wcstools-3.6.4/Makefile subpix: subpix.c $(LIBWCS) libwcs/fitsfile.h $(CC) $(CFLAGS) -o $(BIN)/subpix subpix.c $(LIBS) -@@ -169,13 +166,13 @@ +@@ -169,13 +169,13 @@ $(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(CATLIBS) $(LIBWCS): libwcs/*.c libwcs/*.h - cd libwcs; make -+ $(MAKE) -C libwcs ++ $(MAKE) -C libwcs objclean: - cd libwcs; make clean From 0522c473d20d4aa6d981a7c903567076478d7fe5 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 19 Mar 2007 17:55:59 +0000 Subject: [PATCH 10/62] - 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). Fri 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. --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 5 +- wcstools3-codewarn.patch | 700 ++++++++++++++++++++++++++++++++++++++- wcstools3-shared.patch | 82 ++++- 5 files changed, 769 insertions(+), 22 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0182805..e4f7f8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.7.tar.gz +wcstools-3.6.8.tar.gz diff --git a/sources b/sources index a907d32..650cea6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -301be6880e514b7d66997375550fb708 wcstools-3.6.7.tar.gz +c48a173124360facf6b399da8d1f7422 wcstools-3.6.8.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 6b84e63..05c47f9 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,5 +1,5 @@ Name: wcstools -Version: 3.6.7 +Version: 3.6.8 Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image @@ -82,6 +82,9 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch index a619358..35e79d0 100644 --- a/wcstools3-codewarn.patch +++ b/wcstools3-codewarn.patch @@ -29,7 +29,705 @@ diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c else lname = strlen (refcatname); - catname = (char *)calloc (lname + 16, 1); -+ catname = (char *)calloc (lname + 37, 1); ++ catname = (char *)calloc (lname + 37, sizeof(char)); if (lname > 0) sprintf (catname, "%s sources", refcatname); else +diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c +--- wcstools-3.6.8/bincat.c 2007-03-13 16:05:40.000000000 +0100 ++++ wcstools-3.6.8.new/bincat.c 2007-03-19 18:14:16.000000000 +0100 +@@ -90,7 +90,7 @@ + char *lastchar; + char filename[128]; + FILE *flist; +- char *listfile; ++ char *listfile = NULL; + char rastr[32], decstr[32]; + double x, y; + char cs1; +diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c +--- wcstools-3.6.8/crlf.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/crlf.c 2007-03-19 18:25:29.000000000 +0100 +@@ -99,7 +99,7 @@ + if (buffer[i] == (char) 13) + buffer[i] = (char) 10; + } +- (void) write (1, buffer, nbr); ++ write (1, buffer, nbr); + } + } + return; +Sólo en wcstools-3.6.8.new: debugfiles.list +Sólo en wcstools-3.6.8.new: debugsources.list +diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c +--- wcstools-3.6.8/delwcs.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/delwcs.c 2007-03-19 18:07:46.000000000 +0100 +@@ -114,7 +114,7 @@ + + { + char *header; /* FITS image header */ +- char *image; /* Image pixels */ ++ char *image = NULL; /* Image pixels */ + int lhead; /* Maximum number of bytes in FITS header */ + int nbhead; /* Actual number of bytes in FITS header */ + int iraffile; /* 1 if IRAF image */ +diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c +--- wcstools-3.6.8/edhead.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/edhead.c 2007-03-19 18:23:53.000000000 +0100 +@@ -210,8 +210,8 @@ + break; + } + nbytes = i + 1; +- (void) fwrite (headline, 1, nbytes, fd); +- (void) fwrite (newline, 1, 1, fd); ++ fwrite (headline, 1, nbytes, fd); ++ fwrite (newline, 1, 1, fd); + } + fclose (fd); + free (header); +diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c +--- wcstools-3.6.8/getcol.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/getcol.c 2007-03-19 18:25:09.000000000 +0100 +@@ -447,7 +447,7 @@ + nop++; + } + else +- printf (" Constants %s, %s, or operation %s illegal\n",sop1,sop2,opi[0]); ++ printf (" Constants %s, %s, or operation %c illegal\n",sop1,sop2,opi[0]); + } + + /* File to read */ +diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c +--- wcstools-3.6.8/getdate.c 2007-03-19 18:25:53.000000000 +0100 ++++ wcstools-3.6.8.new/getdate.c 2007-03-19 18:13:02.000000000 +0100 +@@ -409,7 +409,7 @@ + int year, vyear; + int lfd, oldfits; + char outform[16]; +- char *fitsdate, *newfdate, *stdate; ++ char *fitsdate = NULL, *newfdate, *stdate; + char temp[64]; + char fyear[16]; + char ts0[9]; +diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c +--- wcstools-3.6.8/getpix.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/getpix.c 2007-03-19 18:24:05.000000000 +0100 +@@ -68,7 +68,7 @@ + char *fn; + char *rrange; /* Row range string */ + char *crange; /* Column range string */ +- char *rstr; ++ char *rstr = NULL; + char *dstr = NULL; + char *cstr; + int systemp; +diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c +--- wcstools-3.6.8/gettab.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/gettab.c 2007-03-19 18:10:32.000000000 +0100 +@@ -559,7 +559,7 @@ + char *alias[]; /* Output names of keywords if different from input */ + + { +- char *str; ++ char *str = NULL; + char *cstr, *cval, cvalue[64]; + int pass = 0; + int drop; +diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c +--- wcstools-3.6.8/imfill.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imfill.c 2007-03-19 18:13:20.000000000 +0100 +@@ -313,7 +313,7 @@ + int nfilled; + int nbadpix; + int i; +- char *irafheader; /* IRAF image header */ ++ char *irafheader = NULL; /* IRAF image header */ + char newname[256]; /* Name for revised image */ + char *ltime; + char *endchar; +diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c +--- wcstools-3.6.8/imsmooth.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imsmooth.c 2007-03-19 18:13:39.000000000 +0100 +@@ -263,7 +263,7 @@ + char *ext = NULL; + char *newimage = NULL; + char *imext = NULL; +- char *imext1; ++ char *imext1 = NULL; + char *fname; + char extname[16]; + int lext = 0; +diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c +--- wcstools-3.6.8/imstack.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/imstack.c 2007-03-19 18:24:43.000000000 +0100 +@@ -194,7 +194,7 @@ + blanks = (char *) malloc ((size_t) nbytes); + for (i = 0; i < nbytes; i++) + blanks[i] = 0; +- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); ++ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); + free (blanks); + } + } +@@ -449,7 +449,7 @@ + blanks = (char *) malloc ((size_t) nbytes); + for (i = 0; i < nbytes; i++) + blanks[i] = 0; +- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); ++ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); + free (blanks); + } + } +diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c +--- wcstools-3.6.8/libwcs/binread.c 2007-03-19 18:25:53.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/binread.c 2007-03-19 18:22:34.000000000 +0100 +@@ -505,7 +505,7 @@ + struct Star *star; + char str[128]; + int nmag; +- int mrv; ++ int mrv = 0; + + nstar = 0; + starcat = binopen (bincat); +@@ -694,7 +694,7 @@ + int nmag; /* Real number of magnitudes per entry (- rv) */ + int jstar; + int nstar; +- double mag; ++ double mag = 0.; + double num; + int magsort; + int istar = 0; +diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c +--- wcstools-3.6.8/libwcs/fileutil.c 2007-01-11 22:57:29.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/fileutil.c 2007-03-19 18:23:34.000000000 +0100 +@@ -343,7 +343,7 @@ + /* If line can be read, add null at the end of the first token */ + if (fgets (token, ncmax, diskfile) != NULL) { + if (token[0] == '#') { +- (void) fgets (token, ncmax, diskfile); ++ fgets (token, ncmax, diskfile); + } + + /* If only character is a control character, return a NULL */ +diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c +--- wcstools-3.6.8/libwcs/findstar.c 2007-01-10 18:35:23.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/findstar.c 2007-03-19 17:51:55.000000000 +0100 +@@ -747,7 +747,7 @@ + double sd = 0.0; + int i; + int npix; +- double dnpix; ++ double dnpix = 0.; + double sum; + + pmin = -1.0e20; +diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c +--- wcstools-3.6.8/libwcs/gsc2read.c 2007-03-13 18:12:56.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/gsc2read.c 2007-03-19 18:21:39.000000000 +0100 +@@ -191,7 +191,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -294,7 +294,7 @@ + char *databuff; + char *lastbuff; + char *oldbuff; +- char *colhead, *colsep; ++ /*char *colhead, *colsep;*/ + int lhead, lbuff, i, j; + char ctab = (char) 9; + char ccom = ','; +diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c +--- wcstools-3.6.8/libwcs/gscread.c 2007-01-10 19:17:17.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/gscread.c 2007-03-19 18:14:55.000000000 +0100 +@@ -549,7 +549,7 @@ + int *gtype; /* Array of object types (returned) */ + int nlog; /* 1 for diagnostics */ + { +- char *table; /* FITS table */ ++ char *table = NULL; /* FITS table */ + char inpath[64]; /* Pathname for input FITS table file */ + char entry[100]; /* Buffer for FITS table row */ + int class; /* Object class (0>star, 3>other) */ +@@ -574,7 +574,7 @@ + double perr0 = 0.0; + double ra0 = 0.0; + double dec0 = 0.0; +- char *str; ++ char *str = NULL; + char *url; + + itot = 0; +@@ -795,7 +795,7 @@ + int rlist[100]; /* List of input FITS tables files */ + char inpath[64]; /* Pathname for input FITS table file */ + char entry[100]; /* Buffer for FITS table row */ +- int class, class0; /* Object class (0>star, 3>other) */ ++ int class = 0, class0 = 0; /* Object class (0>star, 3>other) */ + int sysref=WCS_J2000; /* Catalog coordinate system */ + double eqref=2000.0; /* Catalog equinox */ + struct Keyword kw[8]; /* Keyword structure */ +@@ -808,9 +808,9 @@ + int ik,nk,itable,ntable,jstar; + int nbline,npos,nbhead; + int nbr,nrmax,nstar,i; +- int ift, band0, band; +- double ra,ra0,rasum,dec,dec0,decsum,perr,perr0,perr2,perrsum,msum; +- double mag,mag0,merr,merr0,merr2,merrsum; ++ int ift, band0 = 0., band = 0.; ++ double ra,ra0 = 0.,rasum,dec,dec0 = 0.,decsum,perr,perr0 = 0.,perr2,perrsum,msum; ++ double mag,mag0 = 0.,merr,merr0 = 0.,merr2,merrsum; + double rra1, rra2, rdec1, rdec2; + double rdist, ddist; + char *str; +diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c +--- wcstools-3.6.8/libwcs/hput.c 2007-01-16 18:18:13.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/hput.c 2007-03-19 18:02:03.000000000 +0100 +@@ -273,7 +273,7 @@ + const char *cval; /* character string containing the value for variable + keyword. trailing and leading blanks are removed. */ + { +- int lroot, lcv, i, ii, nkw, lkw, lval; ++ int lroot = 0, lcv, i, ii, nkw, lkw, lval; + int comment = 0; + const char *v; + char keyroot[8], newkey[12], value[80]; +diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c +--- wcstools-3.6.8/libwcs/imhfile.c 2007-01-08 18:24:29.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:23:06.000000000 +0100 +@@ -910,7 +910,7 @@ + + /* Write IRAF header to disk file */ + nbw = write (fd, irafheader, nbhead); +- (void) ftruncate (fd, nbhead); ++ ftruncate (fd, nbhead); + close (fd); + if (nbw < nbhead) { + (void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", +diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c +--- wcstools-3.6.8/libwcs/imsetwcs.c 2007-01-11 23:01:41.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imsetwcs.c 2007-03-19 17:51:28.000000000 +0100 +@@ -136,22 +136,22 @@ + int nmax; /* Maximum number of matches possible (nrg or nbs) */ + int lofld = 0; /* Length of object name field in output */ + double mag1,mag2; +- int refcat; /* reference catalog switch */ ++ int refcat = 0; /* reference catalog switch */ + int nmag, mprop; + double dxys; + char numstr[32]; + int minstars; +- int ngmax; ++ int ngmax = 0; + int nbin, nbytes; + int iterate, toliterate, nfiterate; +- int imag, magsort; ++ int imag, magsort = 0; + int niter = 0; + int recenter = recenter0; + int ret = 0; + int is, ig, igs, i, j; + char rstr[32], dstr[32]; + double refeq, refep; +- double maxnum; ++ double maxnum = 0.; + int nnfld; + int refsys; + char refcoor[8]; +diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c +--- wcstools-3.6.8/libwcs/imutil.c 2007-01-11 20:51:15.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imutil.c 2007-03-19 18:06:49.000000000 +0100 +@@ -164,7 +164,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int bitpixb; /* Number of bits per pixel in bad pixel file */ +@@ -217,7 +217,7 @@ + if (*bb++) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -236,7 +236,7 @@ + if (*bb++) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -263,7 +263,7 @@ + if (*bb++) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -282,7 +282,7 @@ + if (*bb++) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -310,7 +310,7 @@ + if (*bb++) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -329,7 +329,7 @@ + if (*bb++) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -355,7 +355,7 @@ + if (*bb++) { + *b2++ = bpval; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -374,7 +374,7 @@ + if (*bb++) { + *b2++ = bpval; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -407,7 +407,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int checkmin = 0; +@@ -450,12 +450,12 @@ + if (checkmin && *bb < mnvali2) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvali2) { + *b2++ = bpvali2; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -482,12 +482,12 @@ + if (checkmin && *bb < mnvali4) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvali4) { + *b2++ = bpvali4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -514,12 +514,12 @@ + if (checkmin && *bb < mnvalr4) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvalr4) { + *b2++ = bpvalr4; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -546,12 +546,12 @@ + if (checkmin && *bb < mnvalr8) { + *b2++ = bpvalr8; + nfilled++; +- *b1++; ++ b1++; + } + else if (checkmax && *bb > mxvalr8) { + *b2++ = bpvalr8; + nfilled++; +- *b1++; ++ b1++; + } + else { + *b2++ = *b1++; +@@ -589,7 +589,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -698,7 +698,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1173,7 +1173,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1278,7 +1278,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1651,7 +1651,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +- int ix,iy; /* Pixel around which to compute median */ ++ int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +@@ -1752,7 +1752,7 @@ + { + char *buffret; /* Modified image buffer (returned) */ + int nx,ny; /* Number of columns and rows in image */ +-int ix,iy; /* Pixel around which to compute median */ ++int ix,iy = 0; /* Pixel around which to compute median */ + int npix; /* Number of pixels in image */ + int bitpix; /* Number of bits per pixel (<0=floating point) */ + int naxes; +diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c +--- wcstools-3.6.8/libwcs/proj.c 2006-06-20 22:08:00.000000000 +0200 ++++ wcstools-3.6.8.new/libwcs/proj.c 2007-03-19 18:04:58.000000000 +0100 +@@ -3672,7 +3672,7 @@ + + { + int face; +- double cthe, eta, l, m, n, rho, xi; ++ double cthe, eta = 0., l, m, n, rho, xi = 0.; + const float tol = 1.0e-7; + + float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2; +diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c +--- wcstools-3.6.8/libwcs/sdssread.c 2007-01-10 19:24:44.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/sdssread.c 2007-03-19 18:21:55.000000000 +0100 +@@ -165,7 +165,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c +--- wcstools-3.6.8/libwcs/tabread.c 2007-03-13 18:20:27.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/tabread.c 2007-03-19 18:22:23.000000000 +0100 +@@ -778,7 +778,7 @@ + int nstar; + int imag; + double ra,dec, rapm, decpm; +- double mag, parallax, rv; ++ double mag = 0., parallax, rv; + double num; + int peak; + int istar, nstars, lstar; +@@ -2149,7 +2149,7 @@ + tabtable->lline = (nextline - tabtable->tabdata) * 2; + tabtable->tabline = (char *) calloc (tabtable->lline, 1); + fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); +- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); ++ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); + lline = strlen (tabtable->tabline); + if (tabtable->tabline[lline-1] < 32) + tabtable->tabline[lline-1] = (char) 0; +@@ -2231,7 +2231,7 @@ + fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); + tabtable->iline = 0; + for (i = tabtable->iline; i < iline; i++) { +- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); ++ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); + tabtable->iline++; + } + lline = strlen (tabtable->tabline); +diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c +--- wcstools-3.6.8/libwcs/tmcread.c 2007-01-10 19:09:43.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/tmcread.c 2007-03-19 17:57:35.000000000 +0100 +@@ -529,7 +529,7 @@ + int sysref=WCS_J2000; /* Catalog coordinate system */ + double eqref=2000.0; /* Catalog equinox */ + double epref=2000.0; /* Catalog epoch */ +- struct StarCat *starcat; ++ struct StarCat *starcat = NULL; + struct Star *star; + char *str; + +diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c +--- wcstools-3.6.8/libwcs/wcsinit.c 2007-03-13 22:46:18.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/wcsinit.c 2007-03-19 17:56:56.000000000 +0100 +@@ -1072,7 +1072,7 @@ + static void + wcseq (hstring, wcs) + +-char *hstring; /* character string containing FITS header information ++const char *hstring; /* character string containing FITS header information + in the format = [/ ] */ + struct WorldCoor *wcs; /* World coordinate system data structure */ + { +@@ -1086,7 +1086,7 @@ + static void + wcseqm (hstring, wcs, mchar) + +-char *hstring; /* character string containing FITS header information ++const char *hstring; /* character string containing FITS header information + in the format = [/ ] */ + struct WorldCoor *wcs; /* World coordinate system data structure */ + char *mchar; /* Suffix character for one of multiple WCS */ +diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c +--- wcstools-3.6.8/libwcs/webread.c 2007-03-13 16:53:08.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/webread.c 2007-03-19 18:21:16.000000000 +0100 +@@ -248,7 +248,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -374,7 +374,7 @@ + + /* Dump returned file and stop */ + if (nlog < 0) { +- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); ++ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); + exit (0); + } + +@@ -572,7 +572,7 @@ + fflush(sok); + free (server); + +- (void) fscanf(sok, "%*s %d %*s\r\n", &status); ++ fscanf(sok, "%*s %d %*s\r\n", &status); + + /* Skip continue lines + if (status == 100) { +@@ -606,7 +606,7 @@ + lline = 1; + *lbuff = 0; + while (lline > 0) { +- (void) fgets (linebuff, LINE, sok); ++ fgets (linebuff, LINE, sok); + lline = strlen (linebuff); + if (lline < 1) + break; +@@ -642,7 +642,7 @@ + else { + buff = tabbuff + lcbuff; + } +- (void) fread (buff, 1, lchunk, sok); ++ fread (buff, 1, lchunk, sok); + buff[lchunk] = (char) 0; + if (diag) + fprintf (stderr, "%s\n", buff); +diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c +--- wcstools-3.6.8/scat.c 2007-03-13 17:47:10.000000000 +0100 ++++ wcstools-3.6.8.new/scat.c 2007-03-19 18:08:13.000000000 +0100 +@@ -1101,7 +1101,7 @@ + double crao, cdeco; /* Output center long/lat or RA/Dec in degrees */ + double epout = 0.0; + int ng; /* Number of catalog stars */ +- int ns; /* Number of brightest catalog stars actually used */ ++ int ns = 0; /* Number of brightest catalog stars actually used */ + struct Range *range = NULL; /* Range of catalog numbers to list */ + int nfind; /* Number of stars to find */ + int i, is, j, ngmax, nc; +@@ -1122,7 +1122,7 @@ + int nlog; + int magsort; + int typecol; +- int band; ++ int band = 0; + int imag, nmagr; + int sysout = 0; + char sortletter = (char) 0; +diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c +--- wcstools-3.6.8/setpix.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/setpix.c 2007-03-19 18:09:13.000000000 +0100 +@@ -258,9 +258,9 @@ + int lhead; /* Maximum number of bytes in FITS header */ + int nbhead; /* Actual number of bytes in FITS header */ + int iraffile; /* 1 if IRAF image */ +- char *irafheader; /* IRAF image header */ ++ char *irafheader = NULL; /* IRAF image header */ + int i, lext, lroot; +- int nx, ny, ix, iy, x, y, ipix; ++ int nx, ny, ix, iy, x, y, ipix = 0; + char *imext, *imext1; + double bzero; /* Zero point for pixel scaling */ + double bscale; /* Scale factor for pixel scaling */ +diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c +--- wcstools-3.6.8/wcshead.c 2007-03-13 16:05:41.000000000 +0100 ++++ wcstools-3.6.8.new/wcshead.c 2007-03-19 18:09:34.000000000 +0100 +@@ -211,7 +211,7 @@ + char *GetFITShead(); + char rastr[32], decstr[32], fform[8]; + struct WorldCoor *wcs, *GetWCSFITS(); +- double wfrst, dwl, wlast, dxpix, zvel, vel; ++ double wfrst, dwl, wlast, dxpix, zvel = 0., vel; + int logwav = 0; + + if (rootdir){ diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index ef5ff24..17e0694 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -1,14 +1,6 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile --- wcstools-3.6.7.old/libwcs/Makefile 2007-01-10 20:26:36.000000000 +0100 +++ wcstools-3.6.7/libwcs/Makefile 2007-02-26 15:42:32.000000000 +0100 -@@ -1,5 +1,5 @@ --CFLAGS= -g --CC= cc -Wall -+ -+ - - 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 +11,18 @@ sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o @@ -34,20 +26,16 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile clean: - rm -f *.a *.o + rm -f *.a *.o *.so* ---- wcstools-3.6.7.old/Makefile 2007-01-10 20:38:20.000000000 +0100 -+++ wcstools-3.6.7/Makefile 2007-02-26 15:55:19.000000000 +0100 -@@ -1,7 +1,7 @@ --CFLAGS= -g --CC= cc -Wall +--- wcstools-3.6.8.old/Makefile 2007-02-28 21:44:24.000000000 +0100 ++++ wcstools-3.6.8/Makefile 2007-03-19 17:36:28.000000000 +0100 +@@ -1,6 +1,6 @@ + CFLAGS= -g + CC= cc -LIBWCS = libwcs/libwcs.a --LIBS = $(LIBWCS) -lm -+#CFLAGS= -g -+#CC= cc -Wall +LIBWCS = libwcs/libwcs.so -+LIBS = -L./libwcs -lwcs -lm + LIBS = $(LIBWCS) -lm #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) - BIN = bin @@ -19,10 +19,10 @@ $(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) @@ -87,3 +75,61 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile clean: - make objclean; make binclean + $(MAKE) objclean; $(MAKE) binclean +diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c +--- wcstools-3.6.8/libwcs/imhfile.c 2007-03-19 18:26:41.000000000 +0100 ++++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:40:26.000000000 +0100 +@@ -1036,11 +1036,11 @@ + int len; + char *newpixname; + +- newpixname = (char *) calloc (SZ_IM2PIXFILE, 1); ++ newpixname = (char *) calloc (SZ_IM2PIXFILE + 1, sizeof(char)); + + /* Pixel file is in same directory as header */ + if (strncmp(pixname, "HDR$", 4) == 0 ) { +- (void)strncpy (newpixname, hdrname, SZ_IM2PIXFILE); ++ strncpy (newpixname, hdrname, SZ_IM2PIXFILE); + + /* find the end of the pathname */ + len = strlen (newpixname); +@@ -1053,7 +1053,7 @@ + + /* add name */ + newpixname[len] = '\0'; +- (void)strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); ++ strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); + } + + /* Bare pixel file with no path is assumed to be same as HDR$filename */ +Sólo en wcstools-3.6.8/libwcs: imhfile.o +Sólo en wcstools-3.6.8/libwcs: imio.o +Sólo en wcstools-3.6.8/libwcs: imrotate.o +Sólo en wcstools-3.6.8/libwcs: imsetwcs.o +Sólo en wcstools-3.6.8/libwcs: imutil.o +Sólo en wcstools-3.6.8/libwcs: libwcs.a +Sólo en wcstools-3.6.8/libwcs: libwcs.so +Sólo en wcstools-3.6.8/libwcs: libwcs.so.3 +Sólo en wcstools-3.6.8/libwcs: libwcs.so.3.0.0 +Sólo en wcstools-3.6.8/libwcs: lin.o +Sólo en wcstools-3.6.8/libwcs: matchstar.o +Sólo en wcstools-3.6.8/libwcs: platefit.o +Sólo en wcstools-3.6.8/libwcs: platepos.o +Sólo en wcstools-3.6.8/libwcs: proj.o +Sólo en wcstools-3.6.8/libwcs: sdssread.o +Sólo en wcstools-3.6.8/libwcs: sortstar.o +Sólo en wcstools-3.6.8/libwcs: sph.o +Sólo en wcstools-3.6.8/libwcs: tabread.o +Sólo en wcstools-3.6.8/libwcs: tmcread.o +Sólo en wcstools-3.6.8/libwcs: tnxpos.o +Sólo en wcstools-3.6.8/libwcs: ty2read.o +Sólo en wcstools-3.6.8/libwcs: uacread.o +Sólo en wcstools-3.6.8/libwcs: ubcread.o +Sólo en wcstools-3.6.8/libwcs: ucacread.o +Sólo en wcstools-3.6.8/libwcs: ujcread.o +Sólo en wcstools-3.6.8/libwcs: wcscon.o +Sólo en wcstools-3.6.8/libwcs: wcsinit.o +Sólo en wcstools-3.6.8/libwcs: wcslib.o +Sólo en wcstools-3.6.8/libwcs: wcs.o +Sólo en wcstools-3.6.8/libwcs: wcstrig.o +Sólo en wcstools-3.6.8/libwcs: webread.o +Sólo en wcstools-3.6.8/libwcs: worldpos.o From 6722730b9041d8fe84dc0949b88e48366214e8cf Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 19 Mar 2007 18:02:48 +0000 Subject: [PATCH 11/62] Removed some unused lines in the patchfiles --- wcstools3-codewarn.patch | 2 -- wcstools3-shared.patch | 32 -------------------------------- 2 files changed, 34 deletions(-) diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch index 35e79d0..a31fc5e 100644 --- a/wcstools3-codewarn.patch +++ b/wcstools3-codewarn.patch @@ -57,8 +57,6 @@ diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c } } return; -Sólo en wcstools-3.6.8.new: debugfiles.list -Sólo en wcstools-3.6.8.new: debugsources.list diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c --- wcstools-3.6.8/delwcs.c 2007-03-13 16:05:41.000000000 +0100 +++ wcstools-3.6.8.new/delwcs.c 2007-03-19 18:07:46.000000000 +0100 diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index 17e0694..c55bb70 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -101,35 +101,3 @@ diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c } /* Bare pixel file with no path is assumed to be same as HDR$filename */ -Sólo en wcstools-3.6.8/libwcs: imhfile.o -Sólo en wcstools-3.6.8/libwcs: imio.o -Sólo en wcstools-3.6.8/libwcs: imrotate.o -Sólo en wcstools-3.6.8/libwcs: imsetwcs.o -Sólo en wcstools-3.6.8/libwcs: imutil.o -Sólo en wcstools-3.6.8/libwcs: libwcs.a -Sólo en wcstools-3.6.8/libwcs: libwcs.so -Sólo en wcstools-3.6.8/libwcs: libwcs.so.3 -Sólo en wcstools-3.6.8/libwcs: libwcs.so.3.0.0 -Sólo en wcstools-3.6.8/libwcs: lin.o -Sólo en wcstools-3.6.8/libwcs: matchstar.o -Sólo en wcstools-3.6.8/libwcs: platefit.o -Sólo en wcstools-3.6.8/libwcs: platepos.o -Sólo en wcstools-3.6.8/libwcs: proj.o -Sólo en wcstools-3.6.8/libwcs: sdssread.o -Sólo en wcstools-3.6.8/libwcs: sortstar.o -Sólo en wcstools-3.6.8/libwcs: sph.o -Sólo en wcstools-3.6.8/libwcs: tabread.o -Sólo en wcstools-3.6.8/libwcs: tmcread.o -Sólo en wcstools-3.6.8/libwcs: tnxpos.o -Sólo en wcstools-3.6.8/libwcs: ty2read.o -Sólo en wcstools-3.6.8/libwcs: uacread.o -Sólo en wcstools-3.6.8/libwcs: ubcread.o -Sólo en wcstools-3.6.8/libwcs: ucacread.o -Sólo en wcstools-3.6.8/libwcs: ujcread.o -Sólo en wcstools-3.6.8/libwcs: wcscon.o -Sólo en wcstools-3.6.8/libwcs: wcsinit.o -Sólo en wcstools-3.6.8/libwcs: wcslib.o -Sólo en wcstools-3.6.8/libwcs: wcs.o -Sólo en wcstools-3.6.8/libwcs: wcstrig.o -Sólo en wcstools-3.6.8/libwcs: webread.o -Sólo en wcstools-3.6.8/libwcs: worldpos.o From 1d2d055a40ac84601688ff8249914f491c261284 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Tue, 20 Mar 2007 09:44:54 +0000 Subject: [PATCH 12/62] - 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). Fri 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. --- wcstools.spec | 6 +++++- wcstools3-bug232413.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 wcstools3-bug232413.patch diff --git a/wcstools.spec b/wcstools.spec index 05c47f9..ba21e70 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.6.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -9,6 +9,7 @@ URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch +Patch2: wcstools3-bug232413.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -41,6 +42,7 @@ This are the files needed to develop an application using libwcs. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all @@ -82,6 +84,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 diff --git a/wcstools3-bug232413.patch b/wcstools3-bug232413.patch new file mode 100644 index 0000000..aece19e --- /dev/null +++ b/wcstools3-bug232413.patch @@ -0,0 +1,19 @@ +diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.patch/libwcs/imsetwcs.c +--- wcstools-3.6.8/libwcs/imsetwcs.c 2007-01-11 23:01:41.000000000 +0100 ++++ wcstools-3.6.8.patch/libwcs/imsetwcs.c 2007-03-20 10:15:17.000000000 +0100 +@@ -850,13 +850,13 @@ + if (gc) free ((char *)gc); + + /* Free memory used for object names in reference catalog */ +- if (gobj1 != NULL) { ++/* if (gobj1 != NULL) { + for (i = 0; i < ns; i++) { + if (gobj[i] != NULL) free (gobj[i]); + gobj[i] = NULL; + } + } +- ++*/ + /* Free image source arrays */ + if (sx) free ((char *)sx); + if (sy) free ((char *)sy); From ff8e70471f9231f8eafc914ef278e5d91c5d6b8a Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 20 Aug 2007 15:24:47 +0000 Subject: [PATCH 13/62] Changed License and Buildroot tags --- wcstools.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index ba21e70..efa7902 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -4,13 +4,13 @@ Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering -License: GPL +License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch Patch2: wcstools3-bug232413.patch -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description Wcstools is a set of software utilities, written in C, which create, @@ -22,7 +22,7 @@ search star catalogs and manipulate images. %package -n libwcs Summary: Libwcs shared library Group: System Environment/Libraries -License: LGPL +License: LGPLv2+ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -33,7 +33,7 @@ Shared library necessary to run wcstools and programs based on libwcs. %package -n libwcs-devel Summary: Libraries, includes, etc. used to develop an application with libwcs Group: Development/Libraries -License: LGPL +License: LGPLv2+ Requires: libwcs = %{version}-%{release} %description -n libwcs-devel This are the files needed to develop an application using libwcs. From 45c57638a8016d4b8529bee276d95704996321e6 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 27 Aug 2007 13:55:31 +0000 Subject: [PATCH 14/62] - 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). Fri 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. --- wcstools.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index efa7902..9818296 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.6.8 -Release: 2%{?dist} +Release: 2%{?dist}.1 Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -84,6 +84,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 From b81aa1f7f4fc1d56f629f9810dfd46f6b70132cd Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Fri, 7 Sep 2007 20:16:11 +0000 Subject: [PATCH 15/62] - 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). Fri 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. --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 6 +- wcstools3-codewarn.patch | 664 +++++++++++++++++++++++++++++---------- wcstools3-shared.patch | 2 +- 5 files changed, 506 insertions(+), 170 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4f7f8c..f6e8ae4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.6.8.tar.gz +wcstools-3.7.0.tar.gz diff --git a/sources b/sources index 650cea6..808ea30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c48a173124360facf6b399da8d1f7422 wcstools-3.6.8.tar.gz +bda2748ab4a60e196e3621cc7fa47eda wcstools-3.7.0.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 9818296..4bac64f 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools -Version: 3.6.8 -Release: 2%{?dist}.1 +Version: 3.7.0 +Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -84,6 +84,8 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch index a31fc5e..1d00f14 100644 --- a/wcstools3-codewarn.patch +++ b/wcstools3-codewarn.patch @@ -1,41 +1,6 @@ -+++ wcstools-3.6.6/getdate.c 2006-10-10 12:07:22.000000000 +0200 ---- wcstools-3.6.6.orig/getdate.c 2006-10-10 12:06:11.000000000 +0200 -@@ -413,7 +413,7 @@ - char *fitsdate, *newfdate, *stdate; - char temp[64]; - char fyear[16]; -- char ts0[8]; -+ char ts0[9]; - char *tchar; - int its, its1; - time_t lts; -diff -ur wcstools-3.6.6.orig/libwcs/binread.c wcstools-3.6.6/libwcs/binread.c ---- wcstools-3.6.6.orig/libwcs/binread.c 2006-10-10 12:10:47.000000000 +0200 -+++ wcstools-3.6.6/libwcs/binread.c 2006-10-10 12:11:22.000000000 +0200 -@@ -1358,7 +1358,7 @@ - for (i = 0; i < nmag; i++) { - moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2); - if (sc->byteswapped) -- binswap2 (&st->mag[i], 2); -+ binswap2 ((char*)&st->mag[i], 2); - st->xmag[i] = 0.01 * (double) st->mag[i]; - } - } -diff -ur wcstools-3.6.6.orig/libwcs/catutil.c wcstools-3.6.6/libwcs/catutil.c ---- wcstools-3.6.6.orig/libwcs/catutil.c 2006-10-10 12:10:47.000000000 +0200 -+++ wcstools-3.6.6/libwcs/catutil.c 2006-10-10 12:12:08.000000000 +0200 -@@ -722,7 +722,7 @@ - lname = 0; - else - lname = strlen (refcatname); -- catname = (char *)calloc (lname + 16, 1); -+ catname = (char *)calloc (lname + 37, sizeof(char)); - if (lname > 0) - sprintf (catname, "%s sources", refcatname); - else -diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c ---- wcstools-3.6.8/bincat.c 2007-03-13 16:05:40.000000000 +0100 -+++ wcstools-3.6.8.new/bincat.c 2007-03-19 18:14:16.000000000 +0100 +diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c +--- wcstools-3.7.0/bincat.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/bincat.c 2007-09-07 20:58:35.000000000 +0200 @@ -90,7 +90,7 @@ char *lastchar; char filename[128]; @@ -45,9 +10,21 @@ diff -ur wcstools-3.6.8/bincat.c wcstools-3.6.8.new/bincat.c char rastr[32], decstr[32]; double x, y; char cs1; -diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c ---- wcstools-3.6.8/crlf.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/crlf.c 2007-03-19 18:25:29.000000000 +0100 +diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c +--- wcstools-3.7.0/cphead.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/cphead.c 2007-09-07 21:27:59.000000000 +0200 +@@ -357,7 +357,7 @@ + double dval; + int ival, nch; + int iraffile; +- int ndec, nbheadout, nbheadin, nbheader; ++ int ndec, nbheadout = 0, nbheadin, nbheader; + char newname[128]; + char string[80]; + char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1; +diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c +--- wcstools-3.7.0/crlf.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/crlf.c 2007-09-07 20:59:04.000000000 +0200 @@ -99,7 +99,7 @@ if (buffer[i] == (char) 13) buffer[i] = (char) 10; @@ -57,9 +34,30 @@ diff -ur wcstools-3.6.8/crlf.c wcstools-3.6.8.new/crlf.c } } return; -diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c ---- wcstools-3.6.8/delwcs.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/delwcs.c 2007-03-19 18:07:46.000000000 +0100 +diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c +--- wcstools-3.7.0/delhead.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/delhead.c 2007-09-07 21:51:50.000000000 +0200 +@@ -551,7 +551,7 @@ + char *header; /* FITS header */ + int verbose; /* If true, print deletion confirmations */ + { +- char *hplace, *hcom, *v, *v1, *v2, *ve; ++ char *hplace, *hcom, *v, *v2, *ve; + int i, killcom, nline; + int nkill = 0; + +@@ -585,7 +585,7 @@ + + /* Fill line with blanks */ + else { +- for (i = 0; i++; i < 80) ++ for (i = 0; i < 80; i++) + hcom[i] = ' '; + hplace = hplace + 80; + } +diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c +--- wcstools-3.7.0/delwcs.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/delwcs.c 2007-09-07 20:59:28.000000000 +0200 @@ -114,7 +114,7 @@ { @@ -69,9 +67,9 @@ diff -ur wcstools-3.6.8/delwcs.c wcstools-3.6.8.new/delwcs.c int lhead; /* Maximum number of bytes in FITS header */ int nbhead; /* Actual number of bytes in FITS header */ int iraffile; /* 1 if IRAF image */ -diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c ---- wcstools-3.6.8/edhead.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/edhead.c 2007-03-19 18:23:53.000000000 +0100 +diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c +--- wcstools-3.7.0/edhead.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/edhead.c 2007-09-07 20:59:48.000000000 +0200 @@ -210,8 +210,8 @@ break; } @@ -83,9 +81,21 @@ diff -ur wcstools-3.6.8/edhead.c wcstools-3.6.8.new/edhead.c } fclose (fd); free (header); -diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c ---- wcstools-3.6.8/getcol.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/getcol.c 2007-03-19 18:25:09.000000000 +0100 +diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c +--- wcstools-3.7.0/filename.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/filename.c 2007-09-07 21:32:59.000000000 +0200 +@@ -39,7 +39,7 @@ + { + char *fn, *fn0; + char *str; +- char *name; ++ char *name = NULL; + char *is[10]; + char *endroot; + int i, n; +diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c +--- wcstools-3.7.0/getcol.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/getcol.c 2007-09-07 21:00:14.000000000 +0200 @@ -447,7 +447,7 @@ nop++; } @@ -95,10 +105,10 @@ diff -ur wcstools-3.6.8/getcol.c wcstools-3.6.8.new/getcol.c } /* File to read */ -diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c ---- wcstools-3.6.8/getdate.c 2007-03-19 18:25:53.000000000 +0100 -+++ wcstools-3.6.8.new/getdate.c 2007-03-19 18:13:02.000000000 +0100 -@@ -409,7 +409,7 @@ +diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c +--- wcstools-3.7.0/getdate.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/getdate.c 2007-09-07 21:00:41.000000000 +0200 +@@ -409,10 +409,10 @@ int year, vyear; int lfd, oldfits; char outform[16]; @@ -106,10 +116,14 @@ diff -ur wcstools-3.6.8/getdate.c wcstools-3.6.8.new/getdate.c + char *fitsdate = NULL, *newfdate, *stdate; char temp[64]; char fyear[16]; - char ts0[9]; -diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c ---- wcstools-3.6.8/getpix.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/getpix.c 2007-03-19 18:24:05.000000000 +0100 +- char ts0[8]; ++ char ts0[9]; + char *tchar; + int its, its1; + time_t lts; +diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c +--- wcstools-3.7.0/getpix.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/getpix.c 2007-09-07 21:01:00.000000000 +0200 @@ -68,7 +68,7 @@ char *fn; char *rrange; /* Row range string */ @@ -119,10 +133,10 @@ diff -ur wcstools-3.6.8/getpix.c wcstools-3.6.8.new/getpix.c char *dstr = NULL; char *cstr; int systemp; -diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c ---- wcstools-3.6.8/gettab.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/gettab.c 2007-03-19 18:10:32.000000000 +0100 -@@ -559,7 +559,7 @@ +diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c +--- wcstools-3.7.0/gettab.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/gettab.c 2007-09-07 21:01:31.000000000 +0200 +@@ -558,7 +558,7 @@ char *alias[]; /* Output names of keywords if different from input */ { @@ -131,9 +145,40 @@ diff -ur wcstools-3.6.8/gettab.c wcstools-3.6.8.new/gettab.c char *cstr, *cval, cvalue[64]; int pass = 0; int drop; -diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c ---- wcstools-3.6.8/imfill.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/imfill.c 2007-03-19 18:13:20.000000000 +0100 +diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c +--- wcstools-3.7.0/imcat.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/imcat.c 2007-09-07 21:53:32.000000000 +0200 +@@ -109,9 +109,6 @@ + char **fn; + int i, ic; + int nx, ny; +- char *header; +- double cra, cdec, dra, ddec, secpix; +- int wp, hp, bitpix; + double x, y; + char *refcatname[5]; /* reference catalog name */ + int ncat = 0; +@@ -123,7 +120,7 @@ + int scat = 0; + char c1, c, *ccom; + double drot; +- struct WorldCoor *wcs = NULL; /* World coordinate system structure */ ++ /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */ + + nfile = 0; + fn = (char **)calloc (maxnfile, sizeof(char *)); +@@ -1777,7 +1774,7 @@ + sprintf (headline, "%s %s %s %5.1f %5.1f %d", + numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]); + else if (refcat == SKYBOT) +- sprintf (headline, "%s %s %s %5.2f %5.2f %5.2f", ++ sprintf (headline, "%s %s %s %5.2f %5.2f %5.2f %5.2f", + numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]); + else if (refcat == UJC) + sprintf (headline, "%s %s %s %5.2f %d", +diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c +--- wcstools-3.7.0/imfill.c 2007-08-30 23:47:02.000000000 +0200 ++++ wcstools-3.7.0.new/imfill.c 2007-09-07 21:01:55.000000000 +0200 @@ -313,7 +313,7 @@ int nfilled; int nbadpix; @@ -143,9 +188,9 @@ diff -ur wcstools-3.6.8/imfill.c wcstools-3.6.8.new/imfill.c char newname[256]; /* Name for revised image */ char *ltime; char *endchar; -diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c ---- wcstools-3.6.8/imsmooth.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/imsmooth.c 2007-03-19 18:13:39.000000000 +0100 +diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c +--- wcstools-3.7.0/imsmooth.c 2007-08-30 23:47:03.000000000 +0200 ++++ wcstools-3.7.0.new/imsmooth.c 2007-09-07 21:02:24.000000000 +0200 @@ -263,7 +263,7 @@ char *ext = NULL; char *newimage = NULL; @@ -155,10 +200,10 @@ diff -ur wcstools-3.6.8/imsmooth.c wcstools-3.6.8.new/imsmooth.c char *fname; char extname[16]; int lext = 0; -diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c ---- wcstools-3.6.8/imstack.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/imstack.c 2007-03-19 18:24:43.000000000 +0100 -@@ -194,7 +194,7 @@ +diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c +--- wcstools-3.7.0/imstack.c 2007-08-30 23:47:03.000000000 +0200 ++++ wcstools-3.7.0.new/imstack.c 2007-09-07 21:03:02.000000000 +0200 +@@ -199,7 +199,7 @@ blanks = (char *) malloc ((size_t) nbytes); for (i = 0; i < nbytes; i++) blanks[i] = 0; @@ -167,7 +212,7 @@ diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c free (blanks); } } -@@ -449,7 +449,7 @@ +@@ -475,7 +475,7 @@ blanks = (char *) malloc ((size_t) nbytes); for (i = 0; i < nbytes; i++) blanks[i] = 0; @@ -176,9 +221,9 @@ diff -ur wcstools-3.6.8/imstack.c wcstools-3.6.8.new/imstack.c free (blanks); } } -diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c ---- wcstools-3.6.8/libwcs/binread.c 2007-03-19 18:25:53.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/binread.c 2007-03-19 18:22:34.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c +--- wcstools-3.7.0/libwcs/binread.c 2007-01-11 23:02:42.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/binread.c 2007-09-07 21:03:38.000000000 +0200 @@ -505,7 +505,7 @@ struct Star *star; char str[128]; @@ -193,13 +238,34 @@ diff -ur wcstools-3.6.8/libwcs/binread.c wcstools-3.6.8.new/libwcs/binread.c int jstar; int nstar; - double mag; -+ double mag = 0.; ++ double mag = 0; double num; int magsort; int istar = 0; -diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c ---- wcstools-3.6.8/libwcs/fileutil.c 2007-01-11 22:57:29.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/fileutil.c 2007-03-19 18:23:34.000000000 +0100 +@@ -1372,7 +1372,7 @@ + for (i = 0; i < nmag; i++) { + moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2); + if (sc->byteswapped) +- binswap2 (&st->mag[i], 2); ++ binswap2 ((char*)&st->mag[i], 2); + st->xmag[i] = 0.01 * (double) st->mag[i]; + } + } +diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c +--- wcstools-3.7.0/libwcs/catutil.c 2007-07-23 23:00:32.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/catutil.c 2007-09-07 20:58:14.000000000 +0200 +@@ -737,7 +737,7 @@ + lname = 0; + else + lname = strlen (refcatname); +- catname = (char *)calloc (lname + 16, 1); ++ catname = (char *)calloc (lname + 37, 1); + if (lname > 0) + sprintf (catname, "%s sources", refcatname); + else +diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c +--- wcstools-3.7.0/libwcs/fileutil.c 2007-01-11 22:57:29.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/fileutil.c 2007-09-07 21:04:08.000000000 +0200 @@ -343,7 +343,7 @@ /* If line can be read, add null at the end of the first token */ if (fgets (token, ncmax, diskfile) != NULL) { @@ -209,21 +275,33 @@ diff -ur wcstools-3.6.8/libwcs/fileutil.c wcstools-3.6.8.new/libwcs/fileutil.c } /* If only character is a control character, return a NULL */ -diff -ur wcstools-3.6.8/libwcs/findstar.c wcstools-3.6.8.new/libwcs/findstar.c ---- wcstools-3.6.8/libwcs/findstar.c 2007-01-10 18:35:23.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/findstar.c 2007-03-19 17:51:55.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c +--- wcstools-3.7.0/libwcs/findstar.c 2007-01-10 18:35:23.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/findstar.c 2007-09-07 21:04:43.000000000 +0200 @@ -747,7 +747,7 @@ double sd = 0.0; int i; int npix; - double dnpix; -+ double dnpix = 0.; ++ double dnpix = 0; double sum; pmin = -1.0e20; -diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c ---- wcstools-3.6.8/libwcs/gsc2read.c 2007-03-13 18:12:56.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/gsc2read.c 2007-03-19 18:21:39.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c +--- wcstools-3.7.0/libwcs/fitsfile.c 2007-05-01 00:22:51.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/fitsfile.c 2007-09-07 21:44:46.000000000 +0200 +@@ -874,7 +874,7 @@ + if (!simple) { + nbytes = getfilesize (filename) - nbhead; + if ((image = (char *) malloc (nbytes + 1)) == NULL) { +- snprintf (fitserrmsg,79, "FITSRFULL: %d-byte image buffer cannot be allocated\n"); ++ snprintf (fitserrmsg,79, "FITSRFULL: %d-byte image buffer cannot be allocated\n", nbytes); + (void)close (fd); + return (NULL); + } +diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c +--- wcstools-3.7.0/libwcs/gsc2read.c 2007-07-09 23:36:08.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/gsc2read.c 2007-09-07 21:06:03.000000000 +0200 @@ -191,7 +191,7 @@ /* Dump returned file and stop */ @@ -233,7 +311,7 @@ diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c exit (0); } -@@ -294,7 +294,7 @@ +@@ -293,7 +293,7 @@ char *databuff; char *lastbuff; char *oldbuff; @@ -242,9 +320,18 @@ diff -ur wcstools-3.6.8/libwcs/gsc2read.c wcstools-3.6.8.new/libwcs/gsc2read.c int lhead, lbuff, i, j; char ctab = (char) 9; char ccom = ','; -diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c ---- wcstools-3.6.8/libwcs/gscread.c 2007-01-10 19:17:17.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/gscread.c 2007-03-19 18:14:55.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c +--- wcstools-3.7.0/libwcs/gscread.c 2007-07-05 18:05:03.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/gscread.c 2007-09-07 21:07:44.000000000 +0200 +@@ -512,7 +512,7 @@ + } + + /* Close region input file */ +- (void) close (ift); ++ close (ift); + itot = itot + itable; + if (nlog > 0) + fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d / %5d sources from region %4d \n", @@ -549,7 +549,7 @@ int *gtype; /* Array of object types (returned) */ int nlog; /* 1 for diagnostics */ @@ -263,6 +350,15 @@ diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c char *url; itot = 0; +@@ -756,7 +756,7 @@ + } + + /* Close region input file */ +- (void) close (ift); ++ close (ift); + itot = itot + itable; + if (nlog > 0) + fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n", @@ -795,7 +795,7 @@ int rlist[100]; /* List of input FITS tables files */ char inpath[64]; /* Pathname for input FITS table file */ @@ -285,9 +381,51 @@ diff -ur wcstools-3.6.8/libwcs/gscread.c wcstools-3.6.8.new/libwcs/gscread.c double rra1, rra2, rdec1, rdec2; double rdist, ddist; char *str; -diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c ---- wcstools-3.6.8/libwcs/hput.c 2007-01-16 18:18:13.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/hput.c 2007-03-19 18:02:03.000000000 +0100 +@@ -830,11 +830,11 @@ + + /* Set image parameters */ + bitpix = 0; +- (void)hgeti4 (header, "BITPIX", &bitpix); ++ hgeti4 (header, "BITPIX", &bitpix); + w = 0; +- (void)hgeti4 (header, "NAXIS1", &w); ++ hgeti4 (header, "NAXIS1", &w); + h = 0; +- (void)hgeti4 (header, "NAXIS2", &h); ++ hgeti4 (header, "NAXIS2", &h); + + if (refcat == GSCACT) { + if ((str = getenv("GSCACT_NORTH")) == NULL) +@@ -1080,7 +1080,7 @@ + } + + /* Close region input file */ +- (void) close (ift); ++ close (ift); + itot = itot + itable; + if (nlog > 0) + fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d / %5d sources from region %4d \n", +@@ -1321,7 +1321,7 @@ + jr2 = 0; + } + +- (void) close (ift); ++ close (ift); + return (nrgn); + } + +@@ -1381,7 +1381,7 @@ + double min; /* Minutes of declination */ + + /* Get declination sign from table */ +- (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3); ++ ftgetc (fitsline, &rkw[sgncol], sgn, 3); + + /* Get degrees of declination from table */ + deg = ftgetr8 (fitsline, &rkw[dcol]); +diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c +--- wcstools-3.7.0/libwcs/hput.c 2007-08-22 23:59:56.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/hput.c 2007-09-07 21:47:09.000000000 +0200 @@ -273,7 +273,7 @@ const char *cval; /* character string containing the value for variable keyword. trailing and leading blanks are removed. */ @@ -297,10 +435,31 @@ diff -ur wcstools-3.6.8/libwcs/hput.c wcstools-3.6.8.new/libwcs/hput.c int comment = 0; const char *v; char keyroot[8], newkey[12], value[80]; -diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c ---- wcstools-3.6.8/libwcs/imhfile.c 2007-01-08 18:24:29.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:23:06.000000000 +0100 -@@ -910,7 +910,7 @@ +@@ -599,7 +599,7 @@ + char squot, slash, space; + char line[100]; + int lkeyword, lcom, lhead, i, lblank, ln, nc, lc; +- char *vp, *v1, *v2, *c0, *c1, *q1, *q2; ++ char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL; + + squot = (char) 39; + slash = (char) 47; +diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c +--- wcstools-3.7.0/libwcs/imgetwcs.c 2007-07-26 22:08:41.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/imgetwcs.c 2007-09-07 21:26:47.000000000 +0200 +@@ -381,7 +381,7 @@ + double xref, yref, degpix, secpix; + struct WorldCoor *wcs; + char temp[16]; +- char *cwcs; ++ char *cwcs = NULL; + + /* Set the world coordinate system from the image header */ + if (strlen (filename) > 0) { +diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c +--- wcstools-3.7.0/libwcs/imhfile.c 2007-01-08 18:24:29.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/imhfile.c 2007-09-07 21:09:34.000000000 +0200 +@@ -910,10 +910,10 @@ /* Write IRAF header to disk file */ nbw = write (fd, irafheader, nbhead); @@ -308,10 +467,25 @@ diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c + ftruncate (fd, nbhead); close (fd); if (nbw < nbhead) { - (void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", -diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c ---- wcstools-3.6.8/libwcs/imsetwcs.c 2007-01-11 23:01:41.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/imsetwcs.c 2007-03-19 17:51:28.000000000 +0100 +- (void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", ++ fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", + hdrname, nbw, nbhead); + return (-1); + } +diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c +--- wcstools-3.7.0/libwcs/imrotate.c 2007-04-04 20:42:14.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/imrotate.c 2007-09-07 21:42:33.000000000 +0200 +@@ -371,7 +371,6 @@ + + { + static char flds[15][8]; +- char ctype1[16], ctype2[16]; + double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2; + int i, n, ndec1, ndec2, ndec3, ndec4; + +diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c +--- wcstools-3.7.0/libwcs/imsetwcs.c 2007-03-14 22:03:43.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/imsetwcs.c 2007-09-07 21:10:35.000000000 +0200 @@ -136,22 +136,22 @@ int nmax; /* Maximum number of matches possible (nrg or nbs) */ int lofld = 0; /* Length of object name field in output */ @@ -335,19 +509,19 @@ diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.new/libwcs/imsetwcs.c char rstr[32], dstr[32]; double refeq, refep; - double maxnum; -+ double maxnum = 0.; ++ double maxnum = 0; int nnfld; int refsys; char refcoor[8]; -diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c ---- wcstools-3.6.8/libwcs/imutil.c 2007-01-11 20:51:15.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/imutil.c 2007-03-19 18:06:49.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c +--- wcstools-3.7.0/libwcs/imutil.c 2007-01-11 20:51:15.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/imutil.c 2007-09-07 21:49:38.000000000 +0200 @@ -164,7 +164,7 @@ { char *buffret; /* Modified image buffer (returned) */ int nx,ny; /* Number of columns and rows in image */ -int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ int npix; /* Number of pixels in image */ int bitpix; /* Number of bits per pixel (<0=floating point) */ int bitpixb; /* Number of bits per pixel in bad pixel file */ @@ -428,7 +602,7 @@ diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c char *buffret; /* Modified image buffer (returned) */ int nx,ny; /* Number of columns and rows in image */ -int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ ++int ix,iy = 0; /* Pixel around which to compute mean */ int npix; /* Number of pixels in image */ int bitpix; /* Number of bits per pixel (<0=floating point) */ int checkmin = 0; @@ -546,21 +720,21 @@ diff -ur wcstools-3.6.8/libwcs/imutil.c wcstools-3.6.8.new/libwcs/imutil.c int npix; /* Number of pixels in image */ int bitpix; /* Number of bits per pixel (<0=floating point) */ int naxes; -diff -ur wcstools-3.6.8/libwcs/proj.c wcstools-3.6.8.new/libwcs/proj.c ---- wcstools-3.6.8/libwcs/proj.c 2006-06-20 22:08:00.000000000 +0200 -+++ wcstools-3.6.8.new/libwcs/proj.c 2007-03-19 18:04:58.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c +--- wcstools-3.7.0/libwcs/proj.c 2006-06-20 22:08:00.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/proj.c 2007-09-07 21:15:23.000000000 +0200 @@ -3672,7 +3672,7 @@ { int face; - double cthe, eta, l, m, n, rho, xi; -+ double cthe, eta = 0., l, m, n, rho, xi = 0.; ++ double cthe, eta = 0, l, m, n, rho, xi = 0; const float tol = 1.0e-7; float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2; -diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c ---- wcstools-3.6.8/libwcs/sdssread.c 2007-01-10 19:24:44.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/sdssread.c 2007-03-19 18:21:55.000000000 +0100 +diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c +--- wcstools-3.7.0/libwcs/sdssread.c 2007-01-10 19:24:44.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/sdssread.c 2007-09-07 21:15:41.000000000 +0200 @@ -165,7 +165,7 @@ /* Dump returned file and stop */ @@ -570,19 +744,85 @@ diff -ur wcstools-3.6.8/libwcs/sdssread.c wcstools-3.6.8.new/libwcs/sdssread.c exit (0); } -diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c ---- wcstools-3.6.8/libwcs/tabread.c 2007-03-13 18:20:27.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/tabread.c 2007-03-19 18:22:23.000000000 +0100 -@@ -778,7 +778,7 @@ +diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c +--- wcstools-3.7.0/libwcs/skybotread.c 2007-07-27 20:21:27.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/skybotread.c 2007-09-07 21:42:18.000000000 +0200 +@@ -125,12 +125,11 @@ + int nlog; /* 1 for diagnostics */ + { + char srchurl[LINE]; +- char cmag; + char *obs; + char *dstr; + struct TabTable *tabtable; + struct StarCat *starcat; /* Star catalog data structure */ +- double dtemp, jdout; ++ double jdout; + int nstar, nlog0; + double ra, dec, mag, dradi, dradx; + char rastr[32], decstr[32], temp[256], tstr[80]; +@@ -281,29 +280,22 @@ + + char *skybuff; /* Input comma-separated table */ + { +- char *heading; + char *colhead; + char *colsep; + char *tabbuff; /* Output tab-separated table */ + char *tbuff; +- char *databuff; + char *dbuff; + char *buffer; + char *lastbuff; +- char *endhead; + char *colend; +- char *chead; +- char *head; + char *tbuffi; + char temp[16], format[16]; + int lbuff, i, lra, icol; +- int lhead, ldata; ++ int lhead; + int addname; + int lobj; + char cbuff; +- char *buff; + char cbar = '|'; +- char ccom = ','; + char cminus = '-'; + char cspace = ' '; + char ctab = (char) 9; +diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c +--- wcstools-3.7.0/libwcs/tabread.c 2007-07-23 23:02:01.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/tabread.c 2007-09-07 21:43:33.000000000 +0200 +@@ -147,7 +147,7 @@ + int lname; + int imag; + double ra,dec, rapm, decpm; +- double mag, parallax, rv; ++ double mag = 0, parallax, rv; + double num; + int peak, i; + int istar, nstars, lstar; +@@ -596,7 +596,7 @@ + } + + /* Check ID number first */ +- (void) setoken (&startok, line, "tab"); ++ setoken (&startok, line, "tab"); + if (!strcmp (sc->isfil,"gsc-server")) { + if (tabgetc (&startok, sc->entid, str, 24)) + num = 0.0; +@@ -782,7 +782,7 @@ int nstar; int imag; double ra,dec, rapm, decpm; - double mag, parallax, rv; -+ double mag = 0., parallax, rv; ++ double mag = 0, parallax, rv; double num; int peak; int istar, nstars, lstar; -@@ -2149,7 +2149,7 @@ +@@ -2163,7 +2163,7 @@ tabtable->lline = (nextline - tabtable->tabdata) * 2; tabtable->tabline = (char *) calloc (tabtable->lline, 1); fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); @@ -591,7 +831,16 @@ diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c lline = strlen (tabtable->tabline); if (tabtable->tabline[lline-1] < 32) tabtable->tabline[lline-1] = (char) 0; -@@ -2231,7 +2231,7 @@ +@@ -2173,7 +2173,7 @@ + /* Close catalog file if not reading one line at a time */ + else { + tabtable->lhead = 0; +- (void) fclose (fcat); ++ fclose (fcat); + tabtable->tcat = NULL; + } + +@@ -2245,7 +2245,7 @@ fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); tabtable->iline = 0; for (i = tabtable->iline; i < iline; i++) { @@ -600,9 +849,26 @@ diff -ur wcstools-3.6.8/libwcs/tabread.c wcstools-3.6.8.new/libwcs/tabread.c tabtable->iline++; } lline = strlen (tabtable->tabline); -diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c ---- wcstools-3.6.8/libwcs/tmcread.c 2007-01-10 19:09:43.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/tmcread.c 2007-03-19 17:57:35.000000000 +0100 +@@ -2648,7 +2648,6 @@ + return (0); + } + +- + /* Search table of column headings for first with string (case-independent) */ + + static int +diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c +--- wcstools-3.7.0/libwcs/tmcread.c 2007-01-10 19:09:43.000000000 +0100 ++++ wcstools-3.7.0.new/libwcs/tmcread.c 2007-09-07 21:38:33.000000000 +0200 +@@ -105,7 +105,7 @@ + double eqref=2000.0; /* Catalog equinox */ + double epref=2000.0; /* Catalog epoch */ + double size = 0.0; /* Semi-major axis of extended source */ +- struct StarCat *starcat; ++ struct StarCat *starcat = NULL; + struct Star *star; + int verbose; + int wrap; @@ -529,7 +529,7 @@ int sysref=WCS_J2000; /* Catalog coordinate system */ double eqref=2000.0; /* Catalog equinox */ @@ -612,10 +878,24 @@ diff -ur wcstools-3.6.8/libwcs/tmcread.c wcstools-3.6.8.new/libwcs/tmcread.c struct Star *star; char *str; -diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c ---- wcstools-3.6.8/libwcs/wcsinit.c 2007-03-13 22:46:18.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/wcsinit.c 2007-03-19 17:56:56.000000000 +0100 -@@ -1072,7 +1072,7 @@ +diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c +--- wcstools-3.7.0/libwcs/wcs.c 2007-07-25 20:54:55.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/wcs.c 2007-09-07 21:37:11.000000000 +0200 +@@ -1415,8 +1415,8 @@ + double x2,y2; /* (RA,Dec) or (Long,Lat) in degrees */ + + { +- double xr1, xr2, yr1, yr2, r, diffi; +- double pos1[3], pos2[3], w, diff, cosb; ++ double diffi, r; ++ double pos1[3], pos2[3], w, diff; + int i; + + /* Convert two vectors to direction cosines */ +diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c +--- wcstools-3.7.0/libwcs/wcsinit.c 2007-04-28 01:25:47.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/wcsinit.c 2007-09-07 21:18:43.000000000 +0200 +@@ -1082,7 +1082,7 @@ static void wcseq (hstring, wcs) @@ -624,19 +904,10 @@ diff -ur wcstools-3.6.8/libwcs/wcsinit.c wcstools-3.6.8.new/libwcs/wcsinit.c in the format = [/ ] */ struct WorldCoor *wcs; /* World coordinate system data structure */ { -@@ -1086,7 +1086,7 @@ - static void - wcseqm (hstring, wcs, mchar) - --char *hstring; /* character string containing FITS header information -+const char *hstring; /* character string containing FITS header information - in the format = [/ ] */ - struct WorldCoor *wcs; /* World coordinate system data structure */ - char *mchar; /* Suffix character for one of multiple WCS */ -diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c ---- wcstools-3.6.8/libwcs/webread.c 2007-03-13 16:53:08.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/webread.c 2007-03-19 18:21:16.000000000 +0100 -@@ -248,7 +248,7 @@ +diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c +--- wcstools-3.7.0/libwcs/webread.c 2007-08-28 17:27:19.000000000 +0200 ++++ wcstools-3.7.0.new/libwcs/webread.c 2007-09-07 21:38:10.000000000 +0200 +@@ -252,7 +252,7 @@ /* Dump returned file and stop */ if (nlog < 0) { @@ -645,7 +916,7 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c exit (0); } -@@ -374,7 +374,7 @@ +@@ -378,7 +378,7 @@ /* Dump returned file and stop */ if (nlog < 0) { @@ -654,7 +925,7 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c exit (0); } -@@ -572,7 +572,7 @@ +@@ -612,7 +612,7 @@ fflush(sok); free (server); @@ -663,27 +934,45 @@ diff -ur wcstools-3.6.8/libwcs/webread.c wcstools-3.6.8.new/libwcs/webread.c /* Skip continue lines if (status == 100) { -@@ -606,7 +606,7 @@ - lline = 1; +@@ -647,7 +647,7 @@ *lbuff = 0; + ltbuff = 0; while (lline > 0) { - (void) fgets (linebuff, LINE, sok); + fgets (linebuff, LINE, sok); lline = strlen (linebuff); if (lline < 1) break; -@@ -642,7 +642,7 @@ - else { - buff = tabbuff + lcbuff; - } -- (void) fread (buff, 1, lchunk, sok); -+ fread (buff, 1, lchunk, sok); - buff[lchunk] = (char) 0; - if (diag) - fprintf (stderr, "%s\n", buff); -diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c ---- wcstools-3.6.8/scat.c 2007-03-13 17:47:10.000000000 +0100 -+++ wcstools-3.6.8.new/scat.c 2007-03-19 18:08:13.000000000 +0100 +@@ -689,7 +689,7 @@ + else { + buff = tabbuff + lcbuff; + } +- (void) fread (buff, 1, lchunk, sok); ++ fread (buff, 1, lchunk, sok); + buff[lchunk] = (char) 0; + if (diag) + fprintf (stderr, "%s\n", buff); +@@ -730,7 +730,7 @@ + fprintf (stderr, "%s\n", buff); + } + } +- (void) fclose (sok); ++ fclose (sok); + + return (tabbuff); + } +@@ -864,7 +864,7 @@ + space2tab (tabbuff) + char *tabbuff; /* Tab table filled with spaces */ + { +- char *newbuff, *line0, *line1, *ic, *icn, *tstart; ++ char *newbuff, *line0, *line1, *ic, *icn; + char cspace, ctab, cdash; + int lbuff; + int alltab = 0; +diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c +--- wcstools-3.7.0/scat.c 2007-08-30 23:47:03.000000000 +0200 ++++ wcstools-3.7.0.new/scat.c 2007-09-07 21:31:23.000000000 +0200 @@ -1101,7 +1101,7 @@ double crao, cdeco; /* Output center long/lat or RA/Dec in degrees */ double epout = 0.0; @@ -702,9 +991,18 @@ diff -ur wcstools-3.6.8/scat.c wcstools-3.6.8.new/scat.c int imag, nmagr; int sysout = 0; char sortletter = (char) 0; -diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c ---- wcstools-3.6.8/setpix.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/setpix.c 2007-03-19 18:09:13.000000000 +0100 +@@ -2366,7 +2366,7 @@ + printf (" %5.2f %5.2f %5.2f %5.2f %5.2f", + gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]); + else +- printf (" %5.2f %5.2f %5.2f %5.2f", ++ printf (" %5.2f %5.2f %5.2f %5.2f %5.2f", + gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]); + } + else if (refcat == HIP) { +diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c +--- wcstools-3.7.0/setpix.c 2007-08-30 23:47:03.000000000 +0200 ++++ wcstools-3.7.0.new/setpix.c 2007-09-07 21:22:50.000000000 +0200 @@ -258,9 +258,9 @@ int lhead; /* Maximum number of bytes in FITS header */ int nbhead; /* Actual number of bytes in FITS header */ @@ -717,15 +1015,51 @@ diff -ur wcstools-3.6.8/setpix.c wcstools-3.6.8.new/setpix.c char *imext, *imext1; double bzero; /* Zero point for pixel scaling */ double bscale; /* Scale factor for pixel scaling */ -diff -ur wcstools-3.6.8/wcshead.c wcstools-3.6.8.new/wcshead.c ---- wcstools-3.6.8/wcshead.c 2007-03-13 16:05:41.000000000 +0100 -+++ wcstools-3.6.8.new/wcshead.c 2007-03-19 18:09:34.000000000 +0100 +diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c +--- wcstools-3.7.0/wcshead.c 2007-08-30 23:47:04.000000000 +0200 ++++ wcstools-3.7.0.new/wcshead.c 2007-09-07 21:23:35.000000000 +0200 @@ -211,7 +211,7 @@ char *GetFITShead(); char rastr[32], decstr[32], fform[8]; struct WorldCoor *wcs, *GetWCSFITS(); - double wfrst, dwl, wlast, dxpix, zvel, vel; -+ double wfrst, dwl, wlast, dxpix, zvel = 0., vel; ++ double wfrst, dwl, wlast, dxpix, zvel = 0, vel; int logwav = 0; if (rootdir){ +diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c +--- wcstools-3.7.0/xy2sky.c 2007-08-30 23:47:04.000000000 +0200 ++++ wcstools-3.7.0.new/xy2sky.c 2007-09-07 21:32:39.000000000 +0200 +@@ -46,9 +46,9 @@ + static int ncm = 0; + static int printhead = 0; + static char printonly = 'n'; +-static int centerset = 0; ++/*static int centerset = 0; + static int sizeset = 0; +-static int scaleset = 0; ++static int scaleset = 0;*/ + static int version = 0; /* If 1, print only program name and version */ + + static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink@cfa.harvard.edu)"; +@@ -70,9 +70,9 @@ + int entmag = 0; + int i, ic; + double x, y, mag; +- double cra, cdec, dra, ddec, secpix, drot; ++ double cra, cdec, dra, ddec, secpix;/*, drot;*/ + double eqout = 0.0; +- double eqin = 0.0; ++ /*double eqin = 0.0;*/ + int sysout = 0; + int wp, hp, nx, ny, lhead; + FILE *fd = NULL; +@@ -82,7 +82,7 @@ + char *header; + char *fn; + int bitpix = 0; +- struct WorldCoor *wcs; ++ struct WorldCoor *wcs = NULL; + char xstr[32], ystr[32], mstr[32]; + char rastr[32], decstr[32]; + char keyword[16]; diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index c55bb70..a819e16 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -32,7 +32,7 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile CFLAGS= -g CC= cc -LIBWCS = libwcs/libwcs.a -+LIBWCS = libwcs/libwcs.so ++LIBWCS = -L`pwd`/libwcs -lwcs LIBS = $(LIBWCS) -lm #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) From 2145a25fc512fbbe1ad4672184310d3df9e801a5 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 23:43:15 +0000 Subject: [PATCH 16/62] - Autorebuild for GCC 4.3 --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 4bac64f..8341cbf 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -84,6 +84,9 @@ This are the files needed to develop an application using libwcs. %changelog +* 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 From bf53d8681db71af81727862d616344533083df86 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Wed, 1 Oct 2008 18:45:00 +0000 Subject: [PATCH 17/62] - Fails to build from source bz#465061 --- wcstools.spec | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index 8341cbf..99e4ed4 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -45,7 +45,7 @@ This are the files needed to develop an application using libwcs. %patch2 -p1 %build -%{__make} CC=%{__cc} CFLAGS="%{optflags} -fPIC" all +%{__make} CC="%{__cc}" CFLAGS="%{optflags} -fPIC" all %install %{__rm} -rf %{buildroot} @@ -84,39 +84,55 @@ This are the files needed to develop an application using libwcs. %changelog +* 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). + * Fri 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. From b34dea6cd422a90ac24ac44babe9f9db2aa10ad4 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sat, 14 Feb 2009 16:41:36 +0000 Subject: [PATCH 18/62] - Libray and headers renamed as wcstools --- wcstools.spec | 36 ++++++++++++++++++++++-------------- wcstools3-shared.patch | 12 ++++++------ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index 99e4ed4..1e3033c 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,12 +1,12 @@ Name: wcstools Version: 3.7.0 -Release: 3%{?dist} +Release: 5%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools -Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz +Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz Patch0: wcstools3-shared.patch Patch1: wcstools3-codewarn.patch Patch2: wcstools3-bug232413.patch @@ -19,23 +19,25 @@ image, using specific keywords in the image header which relate pixel position within the image to position on the sky. Auxillary programs search star catalogs and manipulate images. -%package -n libwcs +%package libs Summary: Libwcs shared library Group: System Environment/Libraries License: LGPLv2+ +Obsoletes: libwcs < 3.7.0-4 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -%description -n libwcs +%description libs Shared library necessary to run wcstools and programs based on libwcs. -%package -n libwcs-devel +%package devel Summary: Libraries, includes, etc. used to develop an application with libwcs Group: Development/Libraries License: LGPLv2+ -Requires: libwcs = %{version}-%{release} -%description -n libwcs-devel +Requires: %{name}-libs = %{version}-%{release} +Obsoletes: libwcs-devel < 3.7.0-4 +%description devel This are the files needed to develop an application using libwcs. %prep @@ -51,19 +53,19 @@ This are the files needed to develop an application using libwcs. %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_libdir} %{__mkdir_p} %{buildroot}%{_bindir} -%{__mkdir_p} %{buildroot}%{_includedir}/wcs +%{__mkdir_p} %{buildroot}%{_includedir}/wcstools %{__mkdir_p} %{buildroot}%{_mandir}/man1 %{__install} -p bin/* %{buildroot}%{_bindir} %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} -%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs +%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcstools %{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1 %clean %{__rm} -fr %{buildroot} -%post -n libwcs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -n libwcs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %doc NEWS COPYING Readme Programs @@ -71,19 +73,25 @@ This are the files needed to develop an application using libwcs. %{_bindir}/* %{_mandir}/man1/* -%files -n libwcs +%files libs %defattr(-,root,root) %doc libwcs/COPYING %{_libdir}/*.so.* -%files -n libwcs-devel +%files devel %doc libwcs/COPYING libwcs/NEWS %defattr(-,root,root) %{_libdir}/*.so -%{_includedir}/wcs +%{_includedir}/wcstools %changelog +* 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 diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index a819e16..08187ef 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -5,16 +5,16 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o -+all: libwcs.a libwcs.so.3.0.0 ++all: libwcs.a libwcstools.so.0.0.0 + libwcs.a: $(OBJS) ar rv $@ $? ranlib $@ -+libwcs.so.3.0.0: $(OBJS) -+ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcs.so.3 $? -+ ln -s libwcs.so.3.0.0 libwcs.so.3 -+ ln -s libwcs.so.3.0.0 libwcs.so ++libwcstools.so.0.0.0: $(OBJS) ++ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcstools.so.0 $? ++ ln -s libwcstools.so.0.0.0 libwcstools.so.0 ++ ln -s libwcstools.so.0.0.0 libwcstools.so + + actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h @@ -32,7 +32,7 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile CFLAGS= -g CC= cc -LIBWCS = libwcs/libwcs.a -+LIBWCS = -L`pwd`/libwcs -lwcs ++LIBWCS = -L`pwd`/libwcs -lwcstools LIBS = $(LIBWCS) -lm #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) From 376b3019a6026a25817f7e274b10983dedb5eef6 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Thu, 19 Feb 2009 08:51:20 +0000 Subject: [PATCH 19/62] - Reverting soname change --- wcstools.spec | 17 ++++++++++------- wcstools3-shared.patch | 12 ++++++------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index 1e3033c..f78fffe 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -20,7 +20,7 @@ position within the image to position on the sky. Auxillary programs search star catalogs and manipulate images. %package libs -Summary: Libwcs shared library +Summary: Wcstools shared library Group: System Environment/Libraries License: LGPLv2+ Obsoletes: libwcs < 3.7.0-4 @@ -32,13 +32,13 @@ Requires(postun): /sbin/ldconfig Shared library necessary to run wcstools and programs based on libwcs. %package devel -Summary: Libraries, includes, etc. used to develop an application with libwcs +Summary: Libraries, includes, etc. used to develop an application with wcstools Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} Obsoletes: libwcs-devel < 3.7.0-4 %description devel -This are the files needed to develop an application using libwcs. +This are the files needed to develop an application using wcstools. %prep %setup -q @@ -53,11 +53,11 @@ This are the files needed to develop an application using libwcs. %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_libdir} %{__mkdir_p} %{buildroot}%{_bindir} -%{__mkdir_p} %{buildroot}%{_includedir}/wcstools +%{__mkdir_p} %{buildroot}%{_includedir}/wcs %{__mkdir_p} %{buildroot}%{_mandir}/man1 %{__install} -p bin/* %{buildroot}%{_bindir} %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} -%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcstools +%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs %{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1 %clean @@ -82,10 +82,13 @@ This are the files needed to develop an application using libwcs. %doc libwcs/COPYING libwcs/NEWS %defattr(-,root,root) %{_libdir}/*.so -%{_includedir}/wcstools +%{_includedir}/wcs %changelog +* 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 diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index 08187ef..5131bbb 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -5,16 +5,16 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o -+all: libwcs.a libwcstools.so.0.0.0 ++all: libwcs.a libwcs.so.0.0.0 + libwcs.a: $(OBJS) ar rv $@ $? ranlib $@ -+libwcstools.so.0.0.0: $(OBJS) -+ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcstools.so.0 $? -+ ln -s libwcstools.so.0.0.0 libwcstools.so.0 -+ ln -s libwcstools.so.0.0.0 libwcstools.so ++libwcs.so.0.0.0: $(OBJS) ++ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwc.so.0 $? ++ ln -s libwcs.so.0.0.0 libwcs.so.0 ++ ln -s libwcs.so.0.0.0 libwcs.so + + actread.o: fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h @@ -32,7 +32,7 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile CFLAGS= -g CC= cc -LIBWCS = libwcs/libwcs.a -+LIBWCS = -L`pwd`/libwcs -lwcstools ++LIBWCS = -L`pwd`/libwcs -lwcs LIBS = $(LIBWCS) -lm #CATLIBS = $(LIBS) -lnsl -lsocket CATLIBS = $(LIBS) From 938c5ed438b41bac8aa694eebca79cd3d953fe71 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 25 Feb 2009 18:14:57 +0000 Subject: [PATCH 20/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index f78fffe..142b6b5 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -86,6 +86,9 @@ This are the files needed to develop an application using wcstools. %changelog +* 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 From 769d881c3660e4f05991cf6209cb7d6a0d630d44 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 07:06:49 +0000 Subject: [PATCH 21/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 142b6b5..2af130e 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -86,6 +86,9 @@ This are the files needed to develop an application using wcstools. %changelog +* 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 From f2b0d6d38fcb77491357febe312ddb884b98ed4d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:43:12 +0000 Subject: [PATCH 22/62] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3c081ae..c8211fd 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wcstools -# $Id$ +# $Id: Makefile,v 1.1 2006/06/26 17:27:15 sergiopr Exp $ NAME := wcstools SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 6cb28e24d9c33581e30b0c5d332fa37e437d00ef Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Wed, 3 Feb 2010 18:06:31 +0000 Subject: [PATCH 23/62] - New upstream source - Patch to fix bz #559863 from upstream --- .cvsignore | 2 +- sources | 2 +- wcstools.spec | 20 +- wcstools3-bug232413.patch | 19 - wcstools3-bug559863.patch | 195 +++++++ wcstools3-codewarn.patch | 1065 ------------------------------------- wcstools3-shared.patch | 89 +--- 7 files changed, 219 insertions(+), 1173 deletions(-) delete mode 100644 wcstools3-bug232413.patch create mode 100644 wcstools3-bug559863.patch delete mode 100644 wcstools3-codewarn.patch diff --git a/.cvsignore b/.cvsignore index f6e8ae4..1f8c558 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wcstools-3.7.0.tar.gz +wcstools-3.8.1.tar.gz diff --git a/sources b/sources index 808ea30..68f64bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bda2748ab4a60e196e3621cc7fa47eda wcstools-3.7.0.tar.gz +f70c3f94dd9ec110515571f336da4110 wcstools-3.8.1.tar.gz diff --git a/wcstools.spec b/wcstools.spec index 2af130e..b706d15 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools -Version: 3.7.0 -Release: 8%{?dist} +Version: 3.8.1 +Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -8,8 +8,7 @@ License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz Patch0: wcstools3-shared.patch -Patch1: wcstools3-codewarn.patch -Patch2: wcstools3-bug232413.patch +Patch1: wcstools3-bug559863.patch Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %description @@ -23,7 +22,6 @@ search star catalogs and manipulate images. Summary: Wcstools shared library Group: System Environment/Libraries License: LGPLv2+ -Obsoletes: libwcs < 3.7.0-4 Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -36,7 +34,6 @@ Summary: Libraries, includes, etc. used to develop an application with wcstools Group: Development/Libraries License: LGPLv2+ Requires: %{name}-libs = %{version}-%{release} -Obsoletes: libwcs-devel < 3.7.0-4 %description devel This are the files needed to develop an application using wcstools. @@ -44,7 +41,6 @@ This are the files needed to develop an application using wcstools. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__make} CC="%{__cc}" CFLAGS="%{optflags} -fPIC" all @@ -69,23 +65,27 @@ This are the files needed to develop an application using wcstools. %files %doc NEWS COPYING Readme Programs -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man1/* %files libs -%defattr(-,root,root) +%defattr(-,root,root,-) %doc libwcs/COPYING %{_libdir}/*.so.* %files devel %doc libwcs/COPYING libwcs/NEWS -%defattr(-,root,root) +%defattr(-,root,root,-) %{_libdir}/*.so %{_includedir}/wcs %changelog +* Tue 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 diff --git a/wcstools3-bug232413.patch b/wcstools3-bug232413.patch deleted file mode 100644 index aece19e..0000000 --- a/wcstools3-bug232413.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ur wcstools-3.6.8/libwcs/imsetwcs.c wcstools-3.6.8.patch/libwcs/imsetwcs.c ---- wcstools-3.6.8/libwcs/imsetwcs.c 2007-01-11 23:01:41.000000000 +0100 -+++ wcstools-3.6.8.patch/libwcs/imsetwcs.c 2007-03-20 10:15:17.000000000 +0100 -@@ -850,13 +850,13 @@ - if (gc) free ((char *)gc); - - /* Free memory used for object names in reference catalog */ -- if (gobj1 != NULL) { -+/* if (gobj1 != NULL) { - for (i = 0; i < ns; i++) { - if (gobj[i] != NULL) free (gobj[i]); - gobj[i] = NULL; - } - } -- -+*/ - /* Free image source arrays */ - if (sx) free ((char *)sx); - if (sy) free ((char *)sy); diff --git a/wcstools3-bug559863.patch b/wcstools3-bug559863.patch new file mode 100644 index 0000000..5968f95 --- /dev/null +++ b/wcstools3-bug559863.patch @@ -0,0 +1,195 @@ +diff -ur wcstools-3.8.1/libwcs/wcs.c wcstools-3.8.1.new/libwcs/wcs.c +--- wcstools-3.8.1/libwcs/wcs.c 2008-02-27 20:07:29.000000000 +0100 ++++ wcstools-3.8.1.new/libwcs/wcs.c 2010-02-03 18:44:51.000000000 +0100 +@@ -1,8 +1,8 @@ + /*** File libwcs/wcs.c +- *** July 25, 2007 ++ *** February 3, 2010 + *** By Doug Mink, dmink@cfa.harvard.edu + *** Harvard-Smithsonian Center for Astrophysics +- *** Copyright (C) 1994-2007 ++ *** Copyright (C) 1994-2010 + *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA + + This library is free software; you can redistribute it and/or +@@ -90,7 +90,6 @@ + static char wcserrmsg[80]; + static char wcsfile[256]={""}; + static void wcslibrot(); +-void wcsrotset(); + static int wcsproj0 = 0; + static int izpix = 0; + static double zpix = 0.0; +@@ -334,7 +333,6 @@ + int i, iproj; + int nctype = 32; + char ctypes[32][4]; +- char dtypes[10][4]; + + /* Initialize projection types */ + strcpy (ctypes[0], "LIN"); +@@ -370,27 +368,28 @@ + strcpy (ctypes[30], "PLT"); + strcpy (ctypes[31], "TNX"); + +- /* Initialize distortion types */ +- strcpy (dtypes[1], "SIP"); ++ /* First coordinate type */ + + if (!strncmp (ctype1, "LONG",4)) + strncpy (ctype1, "XLON",4); + +- strcpy (wcs->ctype[0], ctype1); +- strcpy (wcs->c1type, ctype1); +- strcpy (wcs->ptype, ctype1); +- + /* Linear coordinates */ +- if (!strncmp (ctype1,"LINEAR",6)) ++ if (!strncmp (ctype1,"LINEAR",6)) { + wcs->prjcode = WCS_LIN; ++ strcpy (wcs->ctype[0], "LINEAR"); ++ } + + /* Pixel coordinates */ +- else if (!strncmp (ctype1,"PIXEL",6)) ++ else if (!strncmp (ctype1,"PIXEL",5)) { + wcs->prjcode = WCS_PIX; ++ strcpy (wcs->ctype[0], "PIXEL"); ++ } + + /*Detector pixel coordinates */ +- else if (strsrch (ctype1,"DET")) ++ else if (strsrch (ctype1,"DET")) { + wcs->prjcode = WCS_PIX; ++ strcpy (wcs->ctype[0], "PIXEL"); ++ } + + /* Set up right ascension, declination, latitude, or longitude */ + else if (ctype1[0] == 'R' || ctype1[0] == 'D' || +@@ -483,9 +482,13 @@ + /* If not sky coordinates, assume linear */ + else { + wcs->prjcode = WCS_LIN; ++ strcpy (wcs->ctype[0], "LINEAR"); + return (0); + } + ++ strcpy (wcs->c1type, wcs->ctype[0]); ++ strcpy (wcs->ptype, wcs->ctype[0]); ++ + /* Second coordinate type */ + if (!strncmp (ctype2, "NPOL",4)) { + ctype2[0] = ctype1[0]; +@@ -503,16 +506,18 @@ + } + else + wcs->latbase = 0; +- strcpy (wcs->ctype[1], ctype2); +- strcpy (wcs->c2type, ctype2); + + /* Linear coordinates */ +- if (!strncmp (ctype2,"LINEAR",6)) ++ if (!strncmp (ctype2,"LINEAR",6)) { + wcs->prjcode = WCS_LIN; ++ strcpy (wcs->ctype[1], "LINEAR"); ++ } + + /* Pixel coordinates */ +- else if (!strncmp (ctype2,"PIXEL",6)) ++ else if (!strncmp (ctype2,"PIXEL",5)) { + wcs->prjcode = WCS_PIX; ++ strcpy (wcs->ctype[1], "PIXEL"); ++ } + + /* Set up right ascension, declination, latitude, or longitude */ + else if (ctype2[0] == 'R' || ctype2[0] == 'D' || +@@ -564,7 +569,9 @@ + /* If not sky coordinates, assume linear */ + else { + wcs->prjcode = WCS_LIN; ++ strcpy (wcs->ctype[1], "LINEAR"); + } ++ strcpy (wcs->c2type, wcs->ctype[1]); + + /* Set distortion code from CTYPE1 extension */ + setdistcode (wcs, ctype1); +@@ -2934,4 +2941,7 @@ + * Feb 23 2007 Fix bug when checking for "DET" in CTYPEi + * Apr 2 2007 Fix PC to CD matrix conversion + * Jul 25 2007 Compute distance between two coordinates using d2v3() ++ * ++ * Jan 11 2010 Move declaration of wcsrotset() to wcs.h ++ * Feb 3 2010 Fix wcstype() to copy only first 8 char of CTYPEs into wcs + */ +diff -ur wcstools-3.8.1/libwcs/wcsinit.c wcstools-3.8.1.new/libwcs/wcsinit.c +--- wcstools-3.8.1/libwcs/wcsinit.c 2009-03-24 20:58:36.000000000 +0100 ++++ wcstools-3.8.1.new/libwcs/wcsinit.c 2010-02-03 18:46:16.000000000 +0100 +@@ -1,8 +1,8 @@ + /*** File libwcs/wcsinit.c +- *** March 24, 2009 ++ *** February 3, 2010 + *** By Doug Mink, dmink@cfa.harvard.edu + *** Harvard-Smithsonian Center for Astrophysics +- *** Copyright (C) 1998-2009 ++ *** Copyright (C) 1998-2010 + *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA + + This library is free software; you can redistribute it and/or +@@ -50,7 +50,6 @@ + static void wcseq(); + static void wcseqm(); + static void wcsioset(); +-void wcsrotset(); + char wcschar(); + + /* set up a WCS structure from a FITS image header lhstring bytes long +@@ -243,9 +242,6 @@ + int nax; + int twod; + int iszpx = 0; +- extern int tnxinit(); +- extern int platepos(); +- extern int dsspos(); + + wcs = (struct WorldCoor *) calloc (1, sizeof(struct WorldCoor)); + +@@ -423,25 +419,23 @@ + ctype2[7] = 'N'; + } + } +- strcpy (wcs->ctype[0], ctype1); +- strcpy (wcs->ctype[1], ctype2); + if (strsrch (ctype2, "LAT") || strsrch (ctype2, "DEC")) + ilat = 2; + else + ilat = 1; + +- /* Read third and fourth coordinate types, if present */ +- strcpy (wcs->ctype[2], ""); +- hgetsc (hstring, "CTYPE3", &mchar, 9, wcs->ctype[2]); +- strcpy (wcs->ctype[3], ""); +- hgetsc (hstring, "CTYPE4", &mchar, 9, wcs->ctype[3]); +- + /* Set projection type in WCS data structure */ + if (wcstype (wcs, ctype1, ctype2)) { + wcsfree (wcs); + return (NULL); + } + ++ /* Read third and fourth coordinate types, if present */ ++ strcpy (wcs->ctype[2], ""); ++ hgetsc (hstring, "CTYPE3", &mchar, 9, wcs->ctype[2]); ++ strcpy (wcs->ctype[3], ""); ++ hgetsc (hstring, "CTYPE4", &mchar, 9, wcs->ctype[3]); ++ + /* Get units, if present, for linear coordinates */ + if (wcs->prjcode == WCS_LIN) { + if (!hgetsc (hstring, "CUNIT1", &mchar, 16, wcs->units[0])) { +@@ -1380,4 +1374,7 @@ + * Jun 27 2008 If NAXIS1 and NAXIS2 not present, check for IMAGEW and IMAGEH + * + * Mar 24 2009 Fix dimension bug if NAXISi not present (fix from John Burns) ++ * ++ * Jan 11 2010 Move all external declarations to header files ++ * Feb 3 2010 Do not copy CTYPE1 and CTYPE2 into wcs structure directly + */ diff --git a/wcstools3-codewarn.patch b/wcstools3-codewarn.patch deleted file mode 100644 index 1d00f14..0000000 --- a/wcstools3-codewarn.patch +++ /dev/null @@ -1,1065 +0,0 @@ -diff -ur wcstools-3.7.0/bincat.c wcstools-3.7.0.new/bincat.c ---- wcstools-3.7.0/bincat.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/bincat.c 2007-09-07 20:58:35.000000000 +0200 -@@ -90,7 +90,7 @@ - char *lastchar; - char filename[128]; - FILE *flist; -- char *listfile; -+ char *listfile = NULL; - char rastr[32], decstr[32]; - double x, y; - char cs1; -diff -ur wcstools-3.7.0/cphead.c wcstools-3.7.0.new/cphead.c ---- wcstools-3.7.0/cphead.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/cphead.c 2007-09-07 21:27:59.000000000 +0200 -@@ -357,7 +357,7 @@ - double dval; - int ival, nch; - int iraffile; -- int ndec, nbheadout, nbheadin, nbheader; -+ int ndec, nbheadout = 0, nbheadin, nbheader; - char newname[128]; - char string[80]; - char *kw, *kwe, *filepath, *fname, *ext, *imext, *imext1; -diff -ur wcstools-3.7.0/crlf.c wcstools-3.7.0.new/crlf.c ---- wcstools-3.7.0/crlf.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/crlf.c 2007-09-07 20:59:04.000000000 +0200 -@@ -99,7 +99,7 @@ - if (buffer[i] == (char) 13) - buffer[i] = (char) 10; - } -- (void) write (1, buffer, nbr); -+ write (1, buffer, nbr); - } - } - return; -diff -ur wcstools-3.7.0/delhead.c wcstools-3.7.0.new/delhead.c ---- wcstools-3.7.0/delhead.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/delhead.c 2007-09-07 21:51:50.000000000 +0200 -@@ -551,7 +551,7 @@ - char *header; /* FITS header */ - int verbose; /* If true, print deletion confirmations */ - { -- char *hplace, *hcom, *v, *v1, *v2, *ve; -+ char *hplace, *hcom, *v, *v2, *ve; - int i, killcom, nline; - int nkill = 0; - -@@ -585,7 +585,7 @@ - - /* Fill line with blanks */ - else { -- for (i = 0; i++; i < 80) -+ for (i = 0; i < 80; i++) - hcom[i] = ' '; - hplace = hplace + 80; - } -diff -ur wcstools-3.7.0/delwcs.c wcstools-3.7.0.new/delwcs.c ---- wcstools-3.7.0/delwcs.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/delwcs.c 2007-09-07 20:59:28.000000000 +0200 -@@ -114,7 +114,7 @@ - - { - char *header; /* FITS image header */ -- char *image; /* Image pixels */ -+ char *image = NULL; /* Image pixels */ - int lhead; /* Maximum number of bytes in FITS header */ - int nbhead; /* Actual number of bytes in FITS header */ - int iraffile; /* 1 if IRAF image */ -diff -ur wcstools-3.7.0/edhead.c wcstools-3.7.0.new/edhead.c ---- wcstools-3.7.0/edhead.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/edhead.c 2007-09-07 20:59:48.000000000 +0200 -@@ -210,8 +210,8 @@ - break; - } - nbytes = i + 1; -- (void) fwrite (headline, 1, nbytes, fd); -- (void) fwrite (newline, 1, 1, fd); -+ fwrite (headline, 1, nbytes, fd); -+ fwrite (newline, 1, 1, fd); - } - fclose (fd); - free (header); -diff -ur wcstools-3.7.0/filename.c wcstools-3.7.0.new/filename.c ---- wcstools-3.7.0/filename.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/filename.c 2007-09-07 21:32:59.000000000 +0200 -@@ -39,7 +39,7 @@ - { - char *fn, *fn0; - char *str; -- char *name; -+ char *name = NULL; - char *is[10]; - char *endroot; - int i, n; -diff -ur wcstools-3.7.0/getcol.c wcstools-3.7.0.new/getcol.c ---- wcstools-3.7.0/getcol.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/getcol.c 2007-09-07 21:00:14.000000000 +0200 -@@ -447,7 +447,7 @@ - nop++; - } - else -- printf (" Constants %s, %s, or operation %s illegal\n",sop1,sop2,opi[0]); -+ printf (" Constants %s, %s, or operation %c illegal\n",sop1,sop2,opi[0]); - } - - /* File to read */ -diff -ur wcstools-3.7.0/getdate.c wcstools-3.7.0.new/getdate.c ---- wcstools-3.7.0/getdate.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/getdate.c 2007-09-07 21:00:41.000000000 +0200 -@@ -409,10 +409,10 @@ - int year, vyear; - int lfd, oldfits; - char outform[16]; -- char *fitsdate, *newfdate, *stdate; -+ char *fitsdate = NULL, *newfdate, *stdate; - char temp[64]; - char fyear[16]; -- char ts0[8]; -+ char ts0[9]; - char *tchar; - int its, its1; - time_t lts; -diff -ur wcstools-3.7.0/getpix.c wcstools-3.7.0.new/getpix.c ---- wcstools-3.7.0/getpix.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/getpix.c 2007-09-07 21:01:00.000000000 +0200 -@@ -68,7 +68,7 @@ - char *fn; - char *rrange; /* Row range string */ - char *crange; /* Column range string */ -- char *rstr; -+ char *rstr = NULL; - char *dstr = NULL; - char *cstr; - int systemp; -diff -ur wcstools-3.7.0/gettab.c wcstools-3.7.0.new/gettab.c ---- wcstools-3.7.0/gettab.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/gettab.c 2007-09-07 21:01:31.000000000 +0200 -@@ -558,7 +558,7 @@ - char *alias[]; /* Output names of keywords if different from input */ - - { -- char *str; -+ char *str = NULL; - char *cstr, *cval, cvalue[64]; - int pass = 0; - int drop; -diff -ur wcstools-3.7.0/imcat.c wcstools-3.7.0.new/imcat.c ---- wcstools-3.7.0/imcat.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/imcat.c 2007-09-07 21:53:32.000000000 +0200 -@@ -109,9 +109,6 @@ - char **fn; - int i, ic; - int nx, ny; -- char *header; -- double cra, cdec, dra, ddec, secpix; -- int wp, hp, bitpix; - double x, y; - char *refcatname[5]; /* reference catalog name */ - int ncat = 0; -@@ -123,7 +120,7 @@ - int scat = 0; - char c1, c, *ccom; - double drot; -- struct WorldCoor *wcs = NULL; /* World coordinate system structure */ -+ /*struct WorldCoor *wcs = NULL;*/ /* World coordinate system structure */ - - nfile = 0; - fn = (char **)calloc (maxnfile, sizeof(char *)); -@@ -1777,7 +1774,7 @@ - sprintf (headline, "%s %s %s %5.1f %5.1f %d", - numstr,rastr,decstr,gm[0][i],gm[1][i],gc[i]); - else if (refcat == SKYBOT) -- sprintf (headline, "%s %s %s %5.2f %5.2f %5.2f", -+ sprintf (headline, "%s %s %s %5.2f %5.2f %5.2f %5.2f", - numstr,rastr,decstr,gm[0][i],gm[1][i],gm[2][i],gm[3][i]); - else if (refcat == UJC) - sprintf (headline, "%s %s %s %5.2f %d", -diff -ur wcstools-3.7.0/imfill.c wcstools-3.7.0.new/imfill.c ---- wcstools-3.7.0/imfill.c 2007-08-30 23:47:02.000000000 +0200 -+++ wcstools-3.7.0.new/imfill.c 2007-09-07 21:01:55.000000000 +0200 -@@ -313,7 +313,7 @@ - int nfilled; - int nbadpix; - int i; -- char *irafheader; /* IRAF image header */ -+ char *irafheader = NULL; /* IRAF image header */ - char newname[256]; /* Name for revised image */ - char *ltime; - char *endchar; -diff -ur wcstools-3.7.0/imsmooth.c wcstools-3.7.0.new/imsmooth.c ---- wcstools-3.7.0/imsmooth.c 2007-08-30 23:47:03.000000000 +0200 -+++ wcstools-3.7.0.new/imsmooth.c 2007-09-07 21:02:24.000000000 +0200 -@@ -263,7 +263,7 @@ - char *ext = NULL; - char *newimage = NULL; - char *imext = NULL; -- char *imext1; -+ char *imext1 = NULL; - char *fname; - char extname[16]; - int lext = 0; -diff -ur wcstools-3.7.0/imstack.c wcstools-3.7.0.new/imstack.c ---- wcstools-3.7.0/imstack.c 2007-08-30 23:47:03.000000000 +0200 -+++ wcstools-3.7.0.new/imstack.c 2007-09-07 21:03:02.000000000 +0200 -@@ -199,7 +199,7 @@ - blanks = (char *) malloc ((size_t) nbytes); - for (i = 0; i < nbytes; i++) - blanks[i] = 0; -- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); -+ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); - free (blanks); - } - } -@@ -475,7 +475,7 @@ - blanks = (char *) malloc ((size_t) nbytes); - for (i = 0; i < nbytes; i++) - blanks[i] = 0; -- (void) fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); -+ fwrite (blanks, (size_t) 1, (size_t)nbytes, fstack); - free (blanks); - } - } -diff -ur wcstools-3.7.0/libwcs/binread.c wcstools-3.7.0.new/libwcs/binread.c ---- wcstools-3.7.0/libwcs/binread.c 2007-01-11 23:02:42.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/binread.c 2007-09-07 21:03:38.000000000 +0200 -@@ -505,7 +505,7 @@ - struct Star *star; - char str[128]; - int nmag; -- int mrv; -+ int mrv = 0; - - nstar = 0; - starcat = binopen (bincat); -@@ -694,7 +694,7 @@ - int nmag; /* Real number of magnitudes per entry (- rv) */ - int jstar; - int nstar; -- double mag; -+ double mag = 0; - double num; - int magsort; - int istar = 0; -@@ -1372,7 +1372,7 @@ - for (i = 0; i < nmag; i++) { - moveb (sc->catline, (char *) st->mag, 2, sc->entmag[0]+(i*2), i*2); - if (sc->byteswapped) -- binswap2 (&st->mag[i], 2); -+ binswap2 ((char*)&st->mag[i], 2); - st->xmag[i] = 0.01 * (double) st->mag[i]; - } - } -diff -ur wcstools-3.7.0/libwcs/catutil.c wcstools-3.7.0.new/libwcs/catutil.c ---- wcstools-3.7.0/libwcs/catutil.c 2007-07-23 23:00:32.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/catutil.c 2007-09-07 20:58:14.000000000 +0200 -@@ -737,7 +737,7 @@ - lname = 0; - else - lname = strlen (refcatname); -- catname = (char *)calloc (lname + 16, 1); -+ catname = (char *)calloc (lname + 37, 1); - if (lname > 0) - sprintf (catname, "%s sources", refcatname); - else -diff -ur wcstools-3.7.0/libwcs/fileutil.c wcstools-3.7.0.new/libwcs/fileutil.c ---- wcstools-3.7.0/libwcs/fileutil.c 2007-01-11 22:57:29.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/fileutil.c 2007-09-07 21:04:08.000000000 +0200 -@@ -343,7 +343,7 @@ - /* If line can be read, add null at the end of the first token */ - if (fgets (token, ncmax, diskfile) != NULL) { - if (token[0] == '#') { -- (void) fgets (token, ncmax, diskfile); -+ fgets (token, ncmax, diskfile); - } - - /* If only character is a control character, return a NULL */ -diff -ur wcstools-3.7.0/libwcs/findstar.c wcstools-3.7.0.new/libwcs/findstar.c ---- wcstools-3.7.0/libwcs/findstar.c 2007-01-10 18:35:23.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/findstar.c 2007-09-07 21:04:43.000000000 +0200 -@@ -747,7 +747,7 @@ - double sd = 0.0; - int i; - int npix; -- double dnpix; -+ double dnpix = 0; - double sum; - - pmin = -1.0e20; -diff -ur wcstools-3.7.0/libwcs/fitsfile.c wcstools-3.7.0.new/libwcs/fitsfile.c ---- wcstools-3.7.0/libwcs/fitsfile.c 2007-05-01 00:22:51.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/fitsfile.c 2007-09-07 21:44:46.000000000 +0200 -@@ -874,7 +874,7 @@ - if (!simple) { - nbytes = getfilesize (filename) - nbhead; - if ((image = (char *) malloc (nbytes + 1)) == NULL) { -- snprintf (fitserrmsg,79, "FITSRFULL: %d-byte image buffer cannot be allocated\n"); -+ snprintf (fitserrmsg,79, "FITSRFULL: %d-byte image buffer cannot be allocated\n", nbytes); - (void)close (fd); - return (NULL); - } -diff -ur wcstools-3.7.0/libwcs/gsc2read.c wcstools-3.7.0.new/libwcs/gsc2read.c ---- wcstools-3.7.0/libwcs/gsc2read.c 2007-07-09 23:36:08.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/gsc2read.c 2007-09-07 21:06:03.000000000 +0200 -@@ -191,7 +191,7 @@ - - /* Dump returned file and stop */ - if (nlog < 0) { -- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); -+ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); - exit (0); - } - -@@ -293,7 +293,7 @@ - char *databuff; - char *lastbuff; - char *oldbuff; -- char *colhead, *colsep; -+ /*char *colhead, *colsep;*/ - int lhead, lbuff, i, j; - char ctab = (char) 9; - char ccom = ','; -diff -ur wcstools-3.7.0/libwcs/gscread.c wcstools-3.7.0.new/libwcs/gscread.c ---- wcstools-3.7.0/libwcs/gscread.c 2007-07-05 18:05:03.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/gscread.c 2007-09-07 21:07:44.000000000 +0200 -@@ -512,7 +512,7 @@ - } - - /* Close region input file */ -- (void) close (ift); -+ close (ift); - itot = itot + itable; - if (nlog > 0) - fprintf (stderr,"GSCREAD: %4d / %4d: %5d / %5d / %5d sources from region %4d \n", -@@ -549,7 +549,7 @@ - int *gtype; /* Array of object types (returned) */ - int nlog; /* 1 for diagnostics */ - { -- char *table; /* FITS table */ -+ char *table = NULL; /* FITS table */ - char inpath[64]; /* Pathname for input FITS table file */ - char entry[100]; /* Buffer for FITS table row */ - int class; /* Object class (0>star, 3>other) */ -@@ -574,7 +574,7 @@ - double perr0 = 0.0; - double ra0 = 0.0; - double dec0 = 0.0; -- char *str; -+ char *str = NULL; - char *url; - - itot = 0; -@@ -756,7 +756,7 @@ - } - - /* Close region input file */ -- (void) close (ift); -+ close (ift); - itot = itot + itable; - if (nlog > 0) - fprintf (stderr,"GSCRNUM: %4d / %4d: %5d / %5d sources, region %4d.%04d\n", -@@ -795,7 +795,7 @@ - int rlist[100]; /* List of input FITS tables files */ - char inpath[64]; /* Pathname for input FITS table file */ - char entry[100]; /* Buffer for FITS table row */ -- int class, class0; /* Object class (0>star, 3>other) */ -+ int class = 0, class0 = 0; /* Object class (0>star, 3>other) */ - int sysref=WCS_J2000; /* Catalog coordinate system */ - double eqref=2000.0; /* Catalog equinox */ - struct Keyword kw[8]; /* Keyword structure */ -@@ -808,9 +808,9 @@ - int ik,nk,itable,ntable,jstar; - int nbline,npos,nbhead; - int nbr,nrmax,nstar,i; -- int ift, band0, band; -- double ra,ra0,rasum,dec,dec0,decsum,perr,perr0,perr2,perrsum,msum; -- double mag,mag0,merr,merr0,merr2,merrsum; -+ int ift, band0 = 0., band = 0.; -+ double ra,ra0 = 0.,rasum,dec,dec0 = 0.,decsum,perr,perr0 = 0.,perr2,perrsum,msum; -+ double mag,mag0 = 0.,merr,merr0 = 0.,merr2,merrsum; - double rra1, rra2, rdec1, rdec2; - double rdist, ddist; - char *str; -@@ -830,11 +830,11 @@ - - /* Set image parameters */ - bitpix = 0; -- (void)hgeti4 (header, "BITPIX", &bitpix); -+ hgeti4 (header, "BITPIX", &bitpix); - w = 0; -- (void)hgeti4 (header, "NAXIS1", &w); -+ hgeti4 (header, "NAXIS1", &w); - h = 0; -- (void)hgeti4 (header, "NAXIS2", &h); -+ hgeti4 (header, "NAXIS2", &h); - - if (refcat == GSCACT) { - if ((str = getenv("GSCACT_NORTH")) == NULL) -@@ -1080,7 +1080,7 @@ - } - - /* Close region input file */ -- (void) close (ift); -+ close (ift); - itot = itot + itable; - if (nlog > 0) - fprintf (stderr,"GSCBIN: %4d / %4d: %5d / %5d / %5d sources from region %4d \n", -@@ -1321,7 +1321,7 @@ - jr2 = 0; - } - -- (void) close (ift); -+ close (ift); - return (nrgn); - } - -@@ -1381,7 +1381,7 @@ - double min; /* Minutes of declination */ - - /* Get declination sign from table */ -- (void) ftgetc (fitsline, &rkw[sgncol], sgn, 3); -+ ftgetc (fitsline, &rkw[sgncol], sgn, 3); - - /* Get degrees of declination from table */ - deg = ftgetr8 (fitsline, &rkw[dcol]); -diff -ur wcstools-3.7.0/libwcs/hput.c wcstools-3.7.0.new/libwcs/hput.c ---- wcstools-3.7.0/libwcs/hput.c 2007-08-22 23:59:56.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/hput.c 2007-09-07 21:47:09.000000000 +0200 -@@ -273,7 +273,7 @@ - const char *cval; /* character string containing the value for variable - keyword. trailing and leading blanks are removed. */ - { -- int lroot, lcv, i, ii, nkw, lkw, lval; -+ int lroot = 0, lcv, i, ii, nkw, lkw, lval; - int comment = 0; - const char *v; - char keyroot[8], newkey[12], value[80]; -@@ -599,7 +599,7 @@ - char squot, slash, space; - char line[100]; - int lkeyword, lcom, lhead, i, lblank, ln, nc, lc; -- char *vp, *v1, *v2, *c0, *c1, *q1, *q2; -+ char *vp, *v1, *v2, *c0, *c1, *q1, *q2=NULL; - - squot = (char) 39; - slash = (char) 47; -diff -ur wcstools-3.7.0/libwcs/imgetwcs.c wcstools-3.7.0.new/libwcs/imgetwcs.c ---- wcstools-3.7.0/libwcs/imgetwcs.c 2007-07-26 22:08:41.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/imgetwcs.c 2007-09-07 21:26:47.000000000 +0200 -@@ -381,7 +381,7 @@ - double xref, yref, degpix, secpix; - struct WorldCoor *wcs; - char temp[16]; -- char *cwcs; -+ char *cwcs = NULL; - - /* Set the world coordinate system from the image header */ - if (strlen (filename) > 0) { -diff -ur wcstools-3.7.0/libwcs/imhfile.c wcstools-3.7.0.new/libwcs/imhfile.c ---- wcstools-3.7.0/libwcs/imhfile.c 2007-01-08 18:24:29.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/imhfile.c 2007-09-07 21:09:34.000000000 +0200 -@@ -910,10 +910,10 @@ - - /* Write IRAF header to disk file */ - nbw = write (fd, irafheader, nbhead); -- (void) ftruncate (fd, nbhead); -+ ftruncate (fd, nbhead); - close (fd); - if (nbw < nbhead) { -- (void)fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", -+ fprintf(stderr, "IRAF header file %s: %d / %d bytes written.\n", - hdrname, nbw, nbhead); - return (-1); - } -diff -ur wcstools-3.7.0/libwcs/imrotate.c wcstools-3.7.0.new/libwcs/imrotate.c ---- wcstools-3.7.0/libwcs/imrotate.c 2007-04-04 20:42:14.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/imrotate.c 2007-09-07 21:42:33.000000000 +0200 -@@ -371,7 +371,6 @@ - - { - static char flds[15][8]; -- char ctype1[16], ctype2[16]; - double ctemp1, ctemp2, ctemp3, ctemp4, naxis1, naxis2; - int i, n, ndec1, ndec2, ndec3, ndec4; - -diff -ur wcstools-3.7.0/libwcs/imsetwcs.c wcstools-3.7.0.new/libwcs/imsetwcs.c ---- wcstools-3.7.0/libwcs/imsetwcs.c 2007-03-14 22:03:43.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/imsetwcs.c 2007-09-07 21:10:35.000000000 +0200 -@@ -136,22 +136,22 @@ - int nmax; /* Maximum number of matches possible (nrg or nbs) */ - int lofld = 0; /* Length of object name field in output */ - double mag1,mag2; -- int refcat; /* reference catalog switch */ -+ int refcat = 0; /* reference catalog switch */ - int nmag, mprop; - double dxys; - char numstr[32]; - int minstars; -- int ngmax; -+ int ngmax = 0; - int nbin, nbytes; - int iterate, toliterate, nfiterate; -- int imag, magsort; -+ int imag, magsort = 0; - int niter = 0; - int recenter = recenter0; - int ret = 0; - int is, ig, igs, i, j; - char rstr[32], dstr[32]; - double refeq, refep; -- double maxnum; -+ double maxnum = 0; - int nnfld; - int refsys; - char refcoor[8]; -diff -ur wcstools-3.7.0/libwcs/imutil.c wcstools-3.7.0.new/libwcs/imutil.c ---- wcstools-3.7.0/libwcs/imutil.c 2007-01-11 20:51:15.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/imutil.c 2007-09-07 21:49:38.000000000 +0200 -@@ -164,7 +164,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int bitpixb; /* Number of bits per pixel in bad pixel file */ -@@ -217,7 +217,7 @@ - if (*bb++) { - *b2++ = bpvali2; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -236,7 +236,7 @@ - if (*bb++) { - *b2++ = bpvali2; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -263,7 +263,7 @@ - if (*bb++) { - *b2++ = bpvali4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -282,7 +282,7 @@ - if (*bb++) { - *b2++ = bpvali4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -310,7 +310,7 @@ - if (*bb++) { - *b2++ = bpvalr4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -329,7 +329,7 @@ - if (*bb++) { - *b2++ = bpvalr4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -355,7 +355,7 @@ - if (*bb++) { - *b2++ = bpval; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -374,7 +374,7 @@ - if (*bb++) { - *b2++ = bpval; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -407,7 +407,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int checkmin = 0; -@@ -450,12 +450,12 @@ - if (checkmin && *bb < mnvali2) { - *b2++ = bpvali2; - nfilled++; -- *b1++; -+ b1++; - } - else if (checkmax && *bb > mxvali2) { - *b2++ = bpvali2; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -482,12 +482,12 @@ - if (checkmin && *bb < mnvali4) { - *b2++ = bpvali4; - nfilled++; -- *b1++; -+ b1++; - } - else if (checkmax && *bb > mxvali4) { - *b2++ = bpvali4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -514,12 +514,12 @@ - if (checkmin && *bb < mnvalr4) { - *b2++ = bpvalr4; - nfilled++; -- *b1++; -+ b1++; - } - else if (checkmax && *bb > mxvalr4) { - *b2++ = bpvalr4; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -546,12 +546,12 @@ - if (checkmin && *bb < mnvalr8) { - *b2++ = bpvalr8; - nfilled++; -- *b1++; -+ b1++; - } - else if (checkmax && *bb > mxvalr8) { - *b2++ = bpvalr8; - nfilled++; -- *b1++; -+ b1++; - } - else { - *b2++ = *b1++; -@@ -589,7 +589,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute median */ -+int ix,iy = 0; /* Pixel around which to compute median */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -@@ -698,7 +698,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute median */ -+int ix,iy = 0; /* Pixel around which to compute median */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -@@ -1173,7 +1173,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -@@ -1278,7 +1278,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute mean */ -+int ix,iy = 0; /* Pixel around which to compute mean */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -@@ -1651,7 +1651,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ -- int ix,iy; /* Pixel around which to compute median */ -+ int ix,iy = 0; /* Pixel around which to compute median */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -@@ -1752,7 +1752,7 @@ - { - char *buffret; /* Modified image buffer (returned) */ - int nx,ny; /* Number of columns and rows in image */ --int ix,iy; /* Pixel around which to compute median */ -+int ix,iy = 0; /* Pixel around which to compute median */ - int npix; /* Number of pixels in image */ - int bitpix; /* Number of bits per pixel (<0=floating point) */ - int naxes; -diff -ur wcstools-3.7.0/libwcs/proj.c wcstools-3.7.0.new/libwcs/proj.c ---- wcstools-3.7.0/libwcs/proj.c 2006-06-20 22:08:00.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/proj.c 2007-09-07 21:15:23.000000000 +0200 -@@ -3672,7 +3672,7 @@ - - { - int face; -- double cthe, eta, l, m, n, rho, xi; -+ double cthe, eta = 0, l, m, n, rho, xi = 0; - const float tol = 1.0e-7; - - float a, a2, a2b2, a4, ab, b, b2, b4, ca2, cb2; -diff -ur wcstools-3.7.0/libwcs/sdssread.c wcstools-3.7.0.new/libwcs/sdssread.c ---- wcstools-3.7.0/libwcs/sdssread.c 2007-01-10 19:24:44.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/sdssread.c 2007-09-07 21:15:41.000000000 +0200 -@@ -165,7 +165,7 @@ - - /* Dump returned file and stop */ - if (nlog < 0) { -- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); -+ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); - exit (0); - } - -diff -ur wcstools-3.7.0/libwcs/skybotread.c wcstools-3.7.0.new/libwcs/skybotread.c ---- wcstools-3.7.0/libwcs/skybotread.c 2007-07-27 20:21:27.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/skybotread.c 2007-09-07 21:42:18.000000000 +0200 -@@ -125,12 +125,11 @@ - int nlog; /* 1 for diagnostics */ - { - char srchurl[LINE]; -- char cmag; - char *obs; - char *dstr; - struct TabTable *tabtable; - struct StarCat *starcat; /* Star catalog data structure */ -- double dtemp, jdout; -+ double jdout; - int nstar, nlog0; - double ra, dec, mag, dradi, dradx; - char rastr[32], decstr[32], temp[256], tstr[80]; -@@ -281,29 +280,22 @@ - - char *skybuff; /* Input comma-separated table */ - { -- char *heading; - char *colhead; - char *colsep; - char *tabbuff; /* Output tab-separated table */ - char *tbuff; -- char *databuff; - char *dbuff; - char *buffer; - char *lastbuff; -- char *endhead; - char *colend; -- char *chead; -- char *head; - char *tbuffi; - char temp[16], format[16]; - int lbuff, i, lra, icol; -- int lhead, ldata; -+ int lhead; - int addname; - int lobj; - char cbuff; -- char *buff; - char cbar = '|'; -- char ccom = ','; - char cminus = '-'; - char cspace = ' '; - char ctab = (char) 9; -diff -ur wcstools-3.7.0/libwcs/tabread.c wcstools-3.7.0.new/libwcs/tabread.c ---- wcstools-3.7.0/libwcs/tabread.c 2007-07-23 23:02:01.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/tabread.c 2007-09-07 21:43:33.000000000 +0200 -@@ -147,7 +147,7 @@ - int lname; - int imag; - double ra,dec, rapm, decpm; -- double mag, parallax, rv; -+ double mag = 0, parallax, rv; - double num; - int peak, i; - int istar, nstars, lstar; -@@ -596,7 +596,7 @@ - } - - /* Check ID number first */ -- (void) setoken (&startok, line, "tab"); -+ setoken (&startok, line, "tab"); - if (!strcmp (sc->isfil,"gsc-server")) { - if (tabgetc (&startok, sc->entid, str, 24)) - num = 0.0; -@@ -782,7 +782,7 @@ - int nstar; - int imag; - double ra,dec, rapm, decpm; -- double mag, parallax, rv; -+ double mag = 0, parallax, rv; - double num; - int peak; - int istar, nstars, lstar; -@@ -2163,7 +2163,7 @@ - tabtable->lline = (nextline - tabtable->tabdata) * 2; - tabtable->tabline = (char *) calloc (tabtable->lline, 1); - fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); -- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); -+ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); - lline = strlen (tabtable->tabline); - if (tabtable->tabline[lline-1] < 32) - tabtable->tabline[lline-1] = (char) 0; -@@ -2173,7 +2173,7 @@ - /* Close catalog file if not reading one line at a time */ - else { - tabtable->lhead = 0; -- (void) fclose (fcat); -+ fclose (fcat); - tabtable->tcat = NULL; - } - -@@ -2245,7 +2245,7 @@ - fseek (tabtable->tcat, (long) tabtable->lhead, SEEK_SET); - tabtable->iline = 0; - for (i = tabtable->iline; i < iline; i++) { -- (void) fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); -+ fgets (tabtable->tabline, tabtable->lline, tabtable->tcat); - tabtable->iline++; - } - lline = strlen (tabtable->tabline); -@@ -2648,7 +2648,6 @@ - return (0); - } - -- - /* Search table of column headings for first with string (case-independent) */ - - static int -diff -ur wcstools-3.7.0/libwcs/tmcread.c wcstools-3.7.0.new/libwcs/tmcread.c ---- wcstools-3.7.0/libwcs/tmcread.c 2007-01-10 19:09:43.000000000 +0100 -+++ wcstools-3.7.0.new/libwcs/tmcread.c 2007-09-07 21:38:33.000000000 +0200 -@@ -105,7 +105,7 @@ - double eqref=2000.0; /* Catalog equinox */ - double epref=2000.0; /* Catalog epoch */ - double size = 0.0; /* Semi-major axis of extended source */ -- struct StarCat *starcat; -+ struct StarCat *starcat = NULL; - struct Star *star; - int verbose; - int wrap; -@@ -529,7 +529,7 @@ - int sysref=WCS_J2000; /* Catalog coordinate system */ - double eqref=2000.0; /* Catalog equinox */ - double epref=2000.0; /* Catalog epoch */ -- struct StarCat *starcat; -+ struct StarCat *starcat = NULL; - struct Star *star; - char *str; - -diff -ur wcstools-3.7.0/libwcs/wcs.c wcstools-3.7.0.new/libwcs/wcs.c ---- wcstools-3.7.0/libwcs/wcs.c 2007-07-25 20:54:55.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/wcs.c 2007-09-07 21:37:11.000000000 +0200 -@@ -1415,8 +1415,8 @@ - double x2,y2; /* (RA,Dec) or (Long,Lat) in degrees */ - - { -- double xr1, xr2, yr1, yr2, r, diffi; -- double pos1[3], pos2[3], w, diff, cosb; -+ double diffi, r; -+ double pos1[3], pos2[3], w, diff; - int i; - - /* Convert two vectors to direction cosines */ -diff -ur wcstools-3.7.0/libwcs/wcsinit.c wcstools-3.7.0.new/libwcs/wcsinit.c ---- wcstools-3.7.0/libwcs/wcsinit.c 2007-04-28 01:25:47.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/wcsinit.c 2007-09-07 21:18:43.000000000 +0200 -@@ -1082,7 +1082,7 @@ - static void - wcseq (hstring, wcs) - --char *hstring; /* character string containing FITS header information -+const char *hstring; /* character string containing FITS header information - in the format = [/ ] */ - struct WorldCoor *wcs; /* World coordinate system data structure */ - { -diff -ur wcstools-3.7.0/libwcs/webread.c wcstools-3.7.0.new/libwcs/webread.c ---- wcstools-3.7.0/libwcs/webread.c 2007-08-28 17:27:19.000000000 +0200 -+++ wcstools-3.7.0.new/libwcs/webread.c 2007-09-07 21:38:10.000000000 +0200 -@@ -252,7 +252,7 @@ - - /* Dump returned file and stop */ - if (nlog < 0) { -- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); -+ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); - exit (0); - } - -@@ -378,7 +378,7 @@ - - /* Dump returned file and stop */ - if (nlog < 0) { -- (void) fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); -+ fwrite (tabtable->tabbuff, tabtable->lbuff, 1, stdout); - exit (0); - } - -@@ -612,7 +612,7 @@ - fflush(sok); - free (server); - -- (void) fscanf(sok, "%*s %d %*s\r\n", &status); -+ fscanf(sok, "%*s %d %*s\r\n", &status); - - /* Skip continue lines - if (status == 100) { -@@ -647,7 +647,7 @@ - *lbuff = 0; - ltbuff = 0; - while (lline > 0) { -- (void) fgets (linebuff, LINE, sok); -+ fgets (linebuff, LINE, sok); - lline = strlen (linebuff); - if (lline < 1) - break; -@@ -689,7 +689,7 @@ - else { - buff = tabbuff + lcbuff; - } -- (void) fread (buff, 1, lchunk, sok); -+ fread (buff, 1, lchunk, sok); - buff[lchunk] = (char) 0; - if (diag) - fprintf (stderr, "%s\n", buff); -@@ -730,7 +730,7 @@ - fprintf (stderr, "%s\n", buff); - } - } -- (void) fclose (sok); -+ fclose (sok); - - return (tabbuff); - } -@@ -864,7 +864,7 @@ - space2tab (tabbuff) - char *tabbuff; /* Tab table filled with spaces */ - { -- char *newbuff, *line0, *line1, *ic, *icn, *tstart; -+ char *newbuff, *line0, *line1, *ic, *icn; - char cspace, ctab, cdash; - int lbuff; - int alltab = 0; -diff -ur wcstools-3.7.0/scat.c wcstools-3.7.0.new/scat.c ---- wcstools-3.7.0/scat.c 2007-08-30 23:47:03.000000000 +0200 -+++ wcstools-3.7.0.new/scat.c 2007-09-07 21:31:23.000000000 +0200 -@@ -1101,7 +1101,7 @@ - double crao, cdeco; /* Output center long/lat or RA/Dec in degrees */ - double epout = 0.0; - int ng; /* Number of catalog stars */ -- int ns; /* Number of brightest catalog stars actually used */ -+ int ns = 0; /* Number of brightest catalog stars actually used */ - struct Range *range = NULL; /* Range of catalog numbers to list */ - int nfind; /* Number of stars to find */ - int i, is, j, ngmax, nc; -@@ -1122,7 +1122,7 @@ - int nlog; - int magsort; - int typecol; -- int band; -+ int band = 0; - int imag, nmagr; - int sysout = 0; - char sortletter = (char) 0; -@@ -2366,7 +2366,7 @@ - printf (" %5.2f %5.2f %5.2f %5.2f %5.2f", - gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]); - else -- printf (" %5.2f %5.2f %5.2f %5.2f", -+ printf (" %5.2f %5.2f %5.2f %5.2f %5.2f", - gm[0][0],gm[1][0],gm[2][0],gm[4][0],gm[5][0]); - } - else if (refcat == HIP) { -diff -ur wcstools-3.7.0/setpix.c wcstools-3.7.0.new/setpix.c ---- wcstools-3.7.0/setpix.c 2007-08-30 23:47:03.000000000 +0200 -+++ wcstools-3.7.0.new/setpix.c 2007-09-07 21:22:50.000000000 +0200 -@@ -258,9 +258,9 @@ - int lhead; /* Maximum number of bytes in FITS header */ - int nbhead; /* Actual number of bytes in FITS header */ - int iraffile; /* 1 if IRAF image */ -- char *irafheader; /* IRAF image header */ -+ char *irafheader = NULL; /* IRAF image header */ - int i, lext, lroot; -- int nx, ny, ix, iy, x, y, ipix; -+ int nx, ny, ix, iy, x, y, ipix = 0; - char *imext, *imext1; - double bzero; /* Zero point for pixel scaling */ - double bscale; /* Scale factor for pixel scaling */ -diff -ur wcstools-3.7.0/wcshead.c wcstools-3.7.0.new/wcshead.c ---- wcstools-3.7.0/wcshead.c 2007-08-30 23:47:04.000000000 +0200 -+++ wcstools-3.7.0.new/wcshead.c 2007-09-07 21:23:35.000000000 +0200 -@@ -211,7 +211,7 @@ - char *GetFITShead(); - char rastr[32], decstr[32], fform[8]; - struct WorldCoor *wcs, *GetWCSFITS(); -- double wfrst, dwl, wlast, dxpix, zvel, vel; -+ double wfrst, dwl, wlast, dxpix, zvel = 0, vel; - int logwav = 0; - - if (rootdir){ -diff -ur wcstools-3.7.0/xy2sky.c wcstools-3.7.0.new/xy2sky.c ---- wcstools-3.7.0/xy2sky.c 2007-08-30 23:47:04.000000000 +0200 -+++ wcstools-3.7.0.new/xy2sky.c 2007-09-07 21:32:39.000000000 +0200 -@@ -46,9 +46,9 @@ - static int ncm = 0; - static int printhead = 0; - static char printonly = 'n'; --static int centerset = 0; -+/*static int centerset = 0; - static int sizeset = 0; --static int scaleset = 0; -+static int scaleset = 0;*/ - static int version = 0; /* If 1, print only program name and version */ - - static char *RevMsg = "XY2SKY WCSTools 3.7.0, 30 August 2007, Doug Mink (dmink@cfa.harvard.edu)"; -@@ -70,9 +70,9 @@ - int entmag = 0; - int i, ic; - double x, y, mag; -- double cra, cdec, dra, ddec, secpix, drot; -+ double cra, cdec, dra, ddec, secpix;/*, drot;*/ - double eqout = 0.0; -- double eqin = 0.0; -+ /*double eqin = 0.0;*/ - int sysout = 0; - int wp, hp, nx, ny, lhead; - FILE *fd = NULL; -@@ -82,7 +82,7 @@ - char *header; - char *fn; - int bitpix = 0; -- struct WorldCoor *wcs; -+ struct WorldCoor *wcs = NULL; - char xstr[32], ystr[32], mstr[32]; - char rastr[32], decstr[32]; - char keyword[16]; diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch index 5131bbb..217b651 100644 --- a/wcstools3-shared.patch +++ b/wcstools3-shared.patch @@ -1,7 +1,7 @@ -diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile ---- wcstools-3.6.7.old/libwcs/Makefile 2007-01-10 20:26:36.000000000 +0100 -+++ wcstools-3.6.7/libwcs/Makefile 2007-02-26 15:42:32.000000000 +0100 -@@ -11,10 +11,18 @@ +diff -ur wcstools-3.8.1/libwcs/Makefile wcstools-3.8.1.new/libwcs/Makefile +--- wcstools-3.8.1/libwcs/Makefile 2007-07-13 21:54:05.000000000 +0200 ++++ wcstools-3.8.1.new/libwcs/Makefile 2010-01-30 01:17:58.000000000 +0100 +@@ -11,10 +11,17 @@ sortstar.o platefit.o iget.o fileutil.o \ wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o @@ -12,92 +12,27 @@ diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile ranlib $@ +libwcs.so.0.0.0: $(OBJS) -+ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwc.so.0 $? ++ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwc.so.0 $? -lm + ln -s libwcs.so.0.0.0 libwcs.so.0 + ln -s libwcs.so.0.0.0 libwcs.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 -@@ -64,4 +72,4 @@ +@@ -65,4 +72,4 @@ worldpos.o: wcs.h fitshead.h wcslib.h clean: - rm -f *.a *.o + rm -f *.a *.o *.so* ---- wcstools-3.6.8.old/Makefile 2007-02-28 21:44:24.000000000 +0100 -+++ wcstools-3.6.8/Makefile 2007-03-19 17:36:28.000000000 +0100 +diff -ur wcstools-3.8.1/Makefile wcstools-3.8.1.new/Makefile +--- wcstools-3.8.1/Makefile 2009-01-05 23:58:59.000000000 +0100 ++++ wcstools-3.8.1.new/Makefile 2010-01-30 01:24:32.000000000 +0100 @@ -1,6 +1,6 @@ CFLAGS= -g CC= cc -LIBWCS = libwcs/libwcs.a -+LIBWCS = -L`pwd`/libwcs -lwcs ++LIBWCS = -L./libwcs -lwcs + LIBNED = libned/libned.a LIBS = $(LIBWCS) -lm - #CATLIBS = $(LIBS) -lnsl -lsocket - CATLIBS = $(LIBS) -@@ -19,10 +19,10 @@ - $(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS) - - bincat: bincat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h -- $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(CATLIBS) -+ $(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(LIBS) - - char2sp: char2sp.c $(LIBWCS) libwcs/fitsfile.h -- $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS) -+ $(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBS) - - conpix: conpix.c $(LIBWCS) libwcs/fitsfile.h - $(CC) $(CFLAGS) -o $(BIN)/conpix conpix.c $(LIBS) -@@ -151,7 +151,7 @@ - $(CC) $(CFLAGS) -o $(BIN)/skycoor skycoor.c $(CATLIBS) - - sp2char: sp2char.c $(LIBWCS) libwcs/fitsfile.h -- $(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS) -+ $(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBS) - - subpix: subpix.c $(LIBWCS) libwcs/fitsfile.h - $(CC) $(CFLAGS) -o $(BIN)/subpix subpix.c $(LIBS) -@@ -169,13 +169,13 @@ - $(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(CATLIBS) - - $(LIBWCS): libwcs/*.c libwcs/*.h -- cd libwcs; make -+ $(MAKE) -C libwcs - - objclean: -- cd libwcs; make clean -+ $(MAKE) -C libwcs clean - - binclean: - rm -f ./bin/* - - clean: -- make objclean; make binclean -+ $(MAKE) objclean; $(MAKE) binclean -diff -ur wcstools-3.6.8/libwcs/imhfile.c wcstools-3.6.8.new/libwcs/imhfile.c ---- wcstools-3.6.8/libwcs/imhfile.c 2007-03-19 18:26:41.000000000 +0100 -+++ wcstools-3.6.8.new/libwcs/imhfile.c 2007-03-19 18:40:26.000000000 +0100 -@@ -1036,11 +1036,11 @@ - int len; - char *newpixname; - -- newpixname = (char *) calloc (SZ_IM2PIXFILE, 1); -+ newpixname = (char *) calloc (SZ_IM2PIXFILE + 1, sizeof(char)); - - /* Pixel file is in same directory as header */ - if (strncmp(pixname, "HDR$", 4) == 0 ) { -- (void)strncpy (newpixname, hdrname, SZ_IM2PIXFILE); -+ strncpy (newpixname, hdrname, SZ_IM2PIXFILE); - - /* find the end of the pathname */ - len = strlen (newpixname); -@@ -1053,7 +1053,7 @@ - - /* add name */ - newpixname[len] = '\0'; -- (void)strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); -+ strncat (newpixname, &pixname[4], SZ_IM2PIXFILE); - } - - /* Bare pixel file with no path is assumed to be same as HDR$filename */ + #LIBS = $(LIBWCS) -lm -lnsl -lsocket From 2544c72a6b14b4ae3a618b59d31aecb94d204bb8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:13:43 +0000 Subject: [PATCH 24/62] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c8211fd..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wcstools -# $Id: Makefile,v 1.1 2006/06/26 17:27:15 sergiopr Exp $ -NAME := wcstools -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 09539416b9c4fe9a6c393ee710988cee57e07427 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 20:11:41 -0600 Subject: [PATCH 25/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index b706d15..10333b5 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image Group: Applications/Engineering @@ -82,6 +82,9 @@ This are the files needed to develop an application using wcstools. %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Feb 03 2010 Sergio Pascual 3.8.1-1 - New upstream source - Patch to fix bz #559863 from upstream From a85043a81ba4add571167da03ee7a90fd7634cf7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 25 Jul 2011 18:23:50 -0400 Subject: [PATCH 26/62] Retire wcstools. --- dead.package | 1 + sources | 1 - wcstools.spec | 158 ------------------------------ wcstools3-bug559863.patch | 195 -------------------------------------- wcstools3-shared.patch | 38 -------- 5 files changed, 1 insertion(+), 392 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 wcstools.spec delete mode 100644 wcstools3-bug559863.patch delete mode 100644 wcstools3-shared.patch diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..6c90bdc --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2011-07-25 due to it being unable to build this package for multiple releases (FTBFS). diff --git a/sources b/sources deleted file mode 100644 index 68f64bc..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -f70c3f94dd9ec110515571f336da4110 wcstools-3.8.1.tar.gz diff --git a/wcstools.spec b/wcstools.spec deleted file mode 100644 index 10333b5..0000000 --- a/wcstools.spec +++ /dev/null @@ -1,158 +0,0 @@ -Name: wcstools -Version: 3.8.1 -Release: 2%{?dist} -Summary: Software utilities to display and manipulate the WCS of a FITS image - -Group: Applications/Engineering -License: GPLv2+ -URL: http://tdc-www.harvard.edu/wcstools -Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz -Patch0: wcstools3-shared.patch -Patch1: wcstools3-bug559863.patch -Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -%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 -image, using specific keywords in the image header which relate pixel -position within the image to position on the sky. Auxillary programs -search star catalogs and manipulate images. - -%package libs -Summary: Wcstools shared library -Group: System Environment/Libraries -License: LGPLv2+ - -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig - -%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 -Group: Development/Libraries -License: LGPLv2+ -Requires: %{name}-libs = %{version}-%{release} -%description devel -This are the files needed to develop an application using wcstools. - -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 - -%build -%{__make} CC="%{__cc}" CFLAGS="%{optflags} -fPIC" all - -%install -%{__rm} -rf %{buildroot} -%{__mkdir_p} %{buildroot}%{_libdir} -%{__mkdir_p} %{buildroot}%{_bindir} -%{__mkdir_p} %{buildroot}%{_includedir}/wcs -%{__mkdir_p} %{buildroot}%{_mandir}/man1 -%{__install} -p bin/* %{buildroot}%{_bindir} -%{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} -%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs -%{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1 - -%clean -%{__rm} -fr %{buildroot} - -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig - -%files -%doc NEWS COPYING Readme Programs -%defattr(-,root,root,-) -%{_bindir}/* -%{_mandir}/man1/* - -%files libs -%defattr(-,root,root,-) -%doc libwcs/COPYING -%{_libdir}/*.so.* - -%files devel -%doc libwcs/COPYING libwcs/NEWS -%defattr(-,root,root,-) -%{_libdir}/*.so -%{_includedir}/wcs - - -%changelog -* Mon Feb 07 2011 Fedora Release Engineering - 3.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue 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). - -* Fri 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/wcstools3-bug559863.patch b/wcstools3-bug559863.patch deleted file mode 100644 index 5968f95..0000000 --- a/wcstools3-bug559863.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff -ur wcstools-3.8.1/libwcs/wcs.c wcstools-3.8.1.new/libwcs/wcs.c ---- wcstools-3.8.1/libwcs/wcs.c 2008-02-27 20:07:29.000000000 +0100 -+++ wcstools-3.8.1.new/libwcs/wcs.c 2010-02-03 18:44:51.000000000 +0100 -@@ -1,8 +1,8 @@ - /*** File libwcs/wcs.c -- *** July 25, 2007 -+ *** February 3, 2010 - *** By Doug Mink, dmink@cfa.harvard.edu - *** Harvard-Smithsonian Center for Astrophysics -- *** Copyright (C) 1994-2007 -+ *** Copyright (C) 1994-2010 - *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA - - This library is free software; you can redistribute it and/or -@@ -90,7 +90,6 @@ - static char wcserrmsg[80]; - static char wcsfile[256]={""}; - static void wcslibrot(); --void wcsrotset(); - static int wcsproj0 = 0; - static int izpix = 0; - static double zpix = 0.0; -@@ -334,7 +333,6 @@ - int i, iproj; - int nctype = 32; - char ctypes[32][4]; -- char dtypes[10][4]; - - /* Initialize projection types */ - strcpy (ctypes[0], "LIN"); -@@ -370,27 +368,28 @@ - strcpy (ctypes[30], "PLT"); - strcpy (ctypes[31], "TNX"); - -- /* Initialize distortion types */ -- strcpy (dtypes[1], "SIP"); -+ /* First coordinate type */ - - if (!strncmp (ctype1, "LONG",4)) - strncpy (ctype1, "XLON",4); - -- strcpy (wcs->ctype[0], ctype1); -- strcpy (wcs->c1type, ctype1); -- strcpy (wcs->ptype, ctype1); -- - /* Linear coordinates */ -- if (!strncmp (ctype1,"LINEAR",6)) -+ if (!strncmp (ctype1,"LINEAR",6)) { - wcs->prjcode = WCS_LIN; -+ strcpy (wcs->ctype[0], "LINEAR"); -+ } - - /* Pixel coordinates */ -- else if (!strncmp (ctype1,"PIXEL",6)) -+ else if (!strncmp (ctype1,"PIXEL",5)) { - wcs->prjcode = WCS_PIX; -+ strcpy (wcs->ctype[0], "PIXEL"); -+ } - - /*Detector pixel coordinates */ -- else if (strsrch (ctype1,"DET")) -+ else if (strsrch (ctype1,"DET")) { - wcs->prjcode = WCS_PIX; -+ strcpy (wcs->ctype[0], "PIXEL"); -+ } - - /* Set up right ascension, declination, latitude, or longitude */ - else if (ctype1[0] == 'R' || ctype1[0] == 'D' || -@@ -483,9 +482,13 @@ - /* If not sky coordinates, assume linear */ - else { - wcs->prjcode = WCS_LIN; -+ strcpy (wcs->ctype[0], "LINEAR"); - return (0); - } - -+ strcpy (wcs->c1type, wcs->ctype[0]); -+ strcpy (wcs->ptype, wcs->ctype[0]); -+ - /* Second coordinate type */ - if (!strncmp (ctype2, "NPOL",4)) { - ctype2[0] = ctype1[0]; -@@ -503,16 +506,18 @@ - } - else - wcs->latbase = 0; -- strcpy (wcs->ctype[1], ctype2); -- strcpy (wcs->c2type, ctype2); - - /* Linear coordinates */ -- if (!strncmp (ctype2,"LINEAR",6)) -+ if (!strncmp (ctype2,"LINEAR",6)) { - wcs->prjcode = WCS_LIN; -+ strcpy (wcs->ctype[1], "LINEAR"); -+ } - - /* Pixel coordinates */ -- else if (!strncmp (ctype2,"PIXEL",6)) -+ else if (!strncmp (ctype2,"PIXEL",5)) { - wcs->prjcode = WCS_PIX; -+ strcpy (wcs->ctype[1], "PIXEL"); -+ } - - /* Set up right ascension, declination, latitude, or longitude */ - else if (ctype2[0] == 'R' || ctype2[0] == 'D' || -@@ -564,7 +569,9 @@ - /* If not sky coordinates, assume linear */ - else { - wcs->prjcode = WCS_LIN; -+ strcpy (wcs->ctype[1], "LINEAR"); - } -+ strcpy (wcs->c2type, wcs->ctype[1]); - - /* Set distortion code from CTYPE1 extension */ - setdistcode (wcs, ctype1); -@@ -2934,4 +2941,7 @@ - * Feb 23 2007 Fix bug when checking for "DET" in CTYPEi - * Apr 2 2007 Fix PC to CD matrix conversion - * Jul 25 2007 Compute distance between two coordinates using d2v3() -+ * -+ * Jan 11 2010 Move declaration of wcsrotset() to wcs.h -+ * Feb 3 2010 Fix wcstype() to copy only first 8 char of CTYPEs into wcs - */ -diff -ur wcstools-3.8.1/libwcs/wcsinit.c wcstools-3.8.1.new/libwcs/wcsinit.c ---- wcstools-3.8.1/libwcs/wcsinit.c 2009-03-24 20:58:36.000000000 +0100 -+++ wcstools-3.8.1.new/libwcs/wcsinit.c 2010-02-03 18:46:16.000000000 +0100 -@@ -1,8 +1,8 @@ - /*** File libwcs/wcsinit.c -- *** March 24, 2009 -+ *** February 3, 2010 - *** By Doug Mink, dmink@cfa.harvard.edu - *** Harvard-Smithsonian Center for Astrophysics -- *** Copyright (C) 1998-2009 -+ *** Copyright (C) 1998-2010 - *** Smithsonian Astrophysical Observatory, Cambridge, MA, USA - - This library is free software; you can redistribute it and/or -@@ -50,7 +50,6 @@ - static void wcseq(); - static void wcseqm(); - static void wcsioset(); --void wcsrotset(); - char wcschar(); - - /* set up a WCS structure from a FITS image header lhstring bytes long -@@ -243,9 +242,6 @@ - int nax; - int twod; - int iszpx = 0; -- extern int tnxinit(); -- extern int platepos(); -- extern int dsspos(); - - wcs = (struct WorldCoor *) calloc (1, sizeof(struct WorldCoor)); - -@@ -423,25 +419,23 @@ - ctype2[7] = 'N'; - } - } -- strcpy (wcs->ctype[0], ctype1); -- strcpy (wcs->ctype[1], ctype2); - if (strsrch (ctype2, "LAT") || strsrch (ctype2, "DEC")) - ilat = 2; - else - ilat = 1; - -- /* Read third and fourth coordinate types, if present */ -- strcpy (wcs->ctype[2], ""); -- hgetsc (hstring, "CTYPE3", &mchar, 9, wcs->ctype[2]); -- strcpy (wcs->ctype[3], ""); -- hgetsc (hstring, "CTYPE4", &mchar, 9, wcs->ctype[3]); -- - /* Set projection type in WCS data structure */ - if (wcstype (wcs, ctype1, ctype2)) { - wcsfree (wcs); - return (NULL); - } - -+ /* Read third and fourth coordinate types, if present */ -+ strcpy (wcs->ctype[2], ""); -+ hgetsc (hstring, "CTYPE3", &mchar, 9, wcs->ctype[2]); -+ strcpy (wcs->ctype[3], ""); -+ hgetsc (hstring, "CTYPE4", &mchar, 9, wcs->ctype[3]); -+ - /* Get units, if present, for linear coordinates */ - if (wcs->prjcode == WCS_LIN) { - if (!hgetsc (hstring, "CUNIT1", &mchar, 16, wcs->units[0])) { -@@ -1380,4 +1374,7 @@ - * Jun 27 2008 If NAXIS1 and NAXIS2 not present, check for IMAGEW and IMAGEH - * - * Mar 24 2009 Fix dimension bug if NAXISi not present (fix from John Burns) -+ * -+ * Jan 11 2010 Move all external declarations to header files -+ * Feb 3 2010 Do not copy CTYPE1 and CTYPE2 into wcs structure directly - */ diff --git a/wcstools3-shared.patch b/wcstools3-shared.patch deleted file mode 100644 index 217b651..0000000 --- a/wcstools3-shared.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ur wcstools-3.8.1/libwcs/Makefile wcstools-3.8.1.new/libwcs/Makefile ---- wcstools-3.8.1/libwcs/Makefile 2007-07-13 21:54:05.000000000 +0200 -+++ wcstools-3.8.1.new/libwcs/Makefile 2010-01-30 01:17:58.000000000 +0100 -@@ -11,10 +11,17 @@ - sortstar.o platefit.o iget.o fileutil.o \ - wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o - -+all: libwcs.a libwcs.so.0.0.0 -+ - libwcs.a: $(OBJS) - ar rv $@ $? - ranlib $@ - -+libwcs.so.0.0.0: $(OBJS) -+ $(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwc.so.0 $? -lm -+ ln -s libwcs.so.0.0.0 libwcs.so.0 -+ ln -s libwcs.so.0.0.0 libwcs.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 -@@ -65,4 +72,4 @@ - worldpos.o: wcs.h fitshead.h wcslib.h - - clean: -- rm -f *.a *.o -+ rm -f *.a *.o *.so* -diff -ur wcstools-3.8.1/Makefile wcstools-3.8.1.new/Makefile ---- wcstools-3.8.1/Makefile 2009-01-05 23:58:59.000000000 +0100 -+++ wcstools-3.8.1.new/Makefile 2010-01-30 01:24:32.000000000 +0100 -@@ -1,6 +1,6 @@ - CFLAGS= -g - CC= cc --LIBWCS = libwcs/libwcs.a -+LIBWCS = -L./libwcs -lwcs - LIBNED = libned/libned.a - LIBS = $(LIBWCS) -lm - #LIBS = $(LIBWCS) -lm -lnsl -lsocket From 95268dfb504ee453b50ca1ff21f26bca77d14d8e Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 17 Jan 2017 17:39:36 +0100 Subject: [PATCH 27/62] Unretire packages (#1413399). --- .gitignore | 1 + dead.package | 1 - sources | 1 + wcstools-3.9.4-rename-shlib.patch | 319 ++++++++++++++++++++++++++++++ wcstools.spec | 161 +++++++++++++++ 5 files changed, 482 insertions(+), 1 deletion(-) delete mode 100644 dead.package create mode 100644 sources create mode 100644 wcstools-3.9.4-rename-shlib.patch create mode 100644 wcstools.spec diff --git a/.gitignore b/.gitignore index 1f8c558..2220f03 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ wcstools-3.8.1.tar.gz +/wcstools-3.9.4.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 6c90bdc..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package was retired on 2011-07-25 due to it being unable to build this package for multiple releases (FTBFS). diff --git a/sources b/sources new file mode 100644 index 0000000..8653df0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (wcstools-3.9.4.tar.gz) = 0f46ac82d8f512496b33b43d417e92acc7d7e0710d217895ad464686837b7e08740e64ce1800b6c58c9e326b5fcfd5387d1817ca6898512baaaf86ec6ca72d6e diff --git a/wcstools-3.9.4-rename-shlib.patch b/wcstools-3.9.4-rename-shlib.patch new file mode 100644 index 0000000..ae7b2c1 --- /dev/null +++ b/wcstools-3.9.4-rename-shlib.patch @@ -0,0 +1,319 @@ +From: Ole Streicher +Date: Fri, 5 Aug 2016 16:17:42 +0200 +Subject: Rename libwcs to libwcstools to avoid conflicts with Mark + Calabretta's wcslib package. + +Also, build a dynamic library and forward CFLAGS, CPPFLAGS and LDFLAGS for +fortification. +--- + Makefile | 134 ++++++++++++++++++++++++++++---------------------------- + libwcs/Makefile | 14 ++++-- + 2 files changed, 76 insertions(+), 72 deletions(-) + +diff --git a/Makefile b/Makefile +index 38a0337..296219c 100644 +--- a/Makefile ++++ b/Makefile +@@ -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,187 +15,186 @@ all: cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \ + 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 + + 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) + + 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) + + 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 ++ $(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/libwcs/Makefile b/libwcs/Makefile +index ec2fae0..25e2eb6 100644 +--- a/libwcs/Makefile ++++ b/libwcs/Makefile +@@ -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 @@ OBJS = imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \ + 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 @@ webread.o: wcscat.h + worldpos.o: wcs.h fitshead.h wcslib.h + + clean: +- rm -f *.a *.o ++ rm -f *.a *.o *.so *.so.* diff --git a/wcstools.spec b/wcstools.spec new file mode 100644 index 0000000..31bd149 --- /dev/null +++ b/wcstools.spec @@ -0,0 +1,161 @@ +Name: wcstools +Version: 3.9.4 +Release: 1%{?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 + +# Patch from Debian to create shared lib and rename it to avoid +# conflicts with Mark Calabretta's wcslib package. +Patch0: wcstools-3.9.4-rename-shlib.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 +image, using specific keywords in the image header which relate pixel +position within the image to position on the sky. Auxiliary programs +search star catalogs and manipulate images. + + +%package libs +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} +%description devel +This are the files needed to develop an application using wcstools. + +%prep +%setup -q +%patch0 -p1 + +# Fix wrong FSF address in source headers +# asked upstream to fix this +grep -rl '59 Temple Place, Suite 330, Boston, MA 02111-1307 USA' --include=*.{c,h} | 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 +CFLAGS="$RPM_OPT_FLAGS" +CPPFLAGS="$RPM_OPT_FLAGS" +export CFLAGS +export CPPFLAGS + +# Parallel build fails +make + +%install +%{__mkdir_p} %{buildroot}%{_libdir} +%{__mkdir_p} %{buildroot}%{_bindir} +%{__mkdir_p} %{buildroot}%{_includedir}/wcs +%{__mkdir_p} %{buildroot}%{_mandir}/man1 +%{__install} -p bin/* %{buildroot}%{_bindir} +%{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} +%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs +%{__install} -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1 + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%files +%doc NEWS COPYING Readme Programs +%{_bindir}/* +%{_mandir}/man1/* + +%files libs +%doc libwcs/COPYING +%{_libdir}/*.so.* + +%files devel +%doc libwcs/COPYING libwcs/NEWS +%{_libdir}/*.so +%{_includedir}/wcs + + +%changelog +* 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. From 396732b2d42700aa177060058a39cde4cd59d465 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Tue, 17 Jan 2017 17:44:13 +0100 Subject: [PATCH 28/62] Fix %license tag in file list --- wcstools.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index 31bd149..ca52e40 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -38,7 +38,7 @@ This are the files needed to develop an application using wcstools. %patch0 -p1 # Fix wrong FSF address in source headers -# asked upstream to fix this +# asked upstream by mail to fix this grep -rl '59 Temple Place, Suite 330, Boston, MA 02111-1307 USA' --include=*.{c,h} | 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' @ @@ -67,16 +67,17 @@ make %postun libs -p /sbin/ldconfig %files -%doc NEWS COPYING Readme Programs +%license COPYING +%doc NEWS Readme Programs %{_bindir}/* %{_mandir}/man1/* %files libs -%doc libwcs/COPYING +%license libwcs/COPYING %{_libdir}/*.so.* %files devel -%doc libwcs/COPYING libwcs/NEWS +%doc libwcs/NEWS %{_libdir}/*.so %{_includedir}/wcs From a57af3590ff9694295ff15aa163bb3c6acc3fb87 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:17:06 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index ca52e40..24d65dd 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.4 -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 @@ -83,6 +83,9 @@ make %changelog +* 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 From aa5ed2b090fbd5dcfc012373570017c8b0d9d4d0 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Fri, 14 Apr 2017 08:33:38 +0200 Subject: [PATCH 30/62] Update to 3.9.5 --- .gitignore | 1 + sources | 2 +- wcstools.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2220f03..caaeb55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ wcstools-3.8.1.tar.gz /wcstools-3.9.4.tar.gz +/wcstools-3.9.5.tar.gz diff --git a/sources b/sources index 8653df0..02c99d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wcstools-3.9.4.tar.gz) = 0f46ac82d8f512496b33b43d417e92acc7d7e0710d217895ad464686837b7e08740e64ce1800b6c58c9e326b5fcfd5387d1817ca6898512baaaf86ec6ca72d6e +SHA512 (wcstools-3.9.5.tar.gz) = aa48081b6f5dc12ed8d64eae5275c27aaa279856f588a3eb429ec0a4943dc482788cb7f84820233f0e2ee4fefeda7ab9bb85c4513a9942c48f5d97a0bde1581d diff --git a/wcstools.spec b/wcstools.spec index 24d65dd..aade162 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools -Version: 3.9.4 -Release: 2%{?dist} +Version: 3.9.5 +Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -83,6 +83,9 @@ make %changelog +* 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 From a3fb66226972d4c91063edbc88287c2dba8c325f Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 20 May 2017 10:10:25 +0200 Subject: [PATCH 31/62] Rename remap to wcsremap --- wcstools.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index aade162..cdc9fd3 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -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 @@ -57,6 +57,12 @@ 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 @@ -83,6 +89,9 @@ make %changelog +* 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 From ba82f24041ea78cbe95b8d2e6a9934cef935e057 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 20 May 2017 10:16:19 +0200 Subject: [PATCH 32/62] Fix typo --- wcstools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index cdc9fd3..2e414c6 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -61,7 +61,7 @@ make # Rename conflicting binary bug #1450190 # Mailed upstream, no response # Debian uses the same rename -mv %{buildroot}{_bindir}/remap %{buildroot}{_bindir}/wcsremap +mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir} %{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs From a5d8f566237c0bf4822747b0db29988faf04ef43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:31:33 +0000 Subject: [PATCH 33/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 2e414c6..8b5c476 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -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 +* 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 From e9b0fb12402391f367a6797475b1f43de940c372 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:12:52 +0000 Subject: [PATCH 34/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- wcstools.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index 8b5c476..be15a16 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -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 +* 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 From 05605663969126a6dcb39f7a9280610ca760d519 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:48:18 +0000 Subject: [PATCH 35/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 be15a16..bc9ec82 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -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 +* 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 From 232251b7f888c35a244f468c1c35c5faca9a0908 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Mon, 19 Feb 2018 18:21:41 +0100 Subject: [PATCH 36/62] Add gcc to BuildRequires --- wcstools.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wcstools.spec b/wcstools.spec index bc9ec82..20d7a8a 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,11 +1,13 @@ Name: wcstools Version: 3.9.5 -Release: 5%{?dist} +Release: 6%{?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 +BuildRequires: gcc + # Patch from Debian to create shared lib and rename it to avoid # conflicts with Mark Calabretta's wcslib package. Patch0: wcstools-3.9.4-rename-shlib.patch @@ -89,6 +91,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* 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 From e87a6ff003edc9df5c785660d83c8b1143756188 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 30 Jun 2018 18:12:20 +0200 Subject: [PATCH 37/62] Remove ldconfig scriptlets --- wcstools.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wcstools.spec b/wcstools.spec index 20d7a8a..c5b074a 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -70,9 +70,6 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %{__install} -p -m 644 man/man1/* %{buildroot}%{_mandir}/man1 -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig %files %license COPYING @@ -91,6 +88,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* 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 From e690b342c4e067199be4a45742a699fc29d6969d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:45:10 +0000 Subject: [PATCH 38/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 c5b074a..0f3c520 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -Release: 7%{?dist} +Release: 8%{?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 +* 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 From 32acb42e7fa28c7c126fde3a67bc7f402f37e196 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:35:07 +0000 Subject: [PATCH 39/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 0f3c520..327ded8 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -Release: 8%{?dist} +Release: 9%{?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 +* 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 From bf9f2212f3875598c215e8c61ff148ee55a24b2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:20:03 +0000 Subject: [PATCH 40/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 327ded8..0509ef4 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -Release: 9%{?dist} +Release: 10%{?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 +* 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 From 118f5c88ea1f77b533827c8b7ec2299f346b68d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:33:07 +0000 Subject: [PATCH 41/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 0509ef4..dcecdcc 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools Version: 3.9.5 -Release: 10%{?dist} +Release: 11%{?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 +* 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 From c9adf1fbce2a83ab49993ae695dd5ec783527f50 Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sat, 27 Jun 2020 18:45:54 +0200 Subject: [PATCH 42/62] Update to 3.9.6 --- .gitignore | 1 + sources | 2 +- ...patch => wcstools-3.9.6-rename-shlib.patch | 100 ++++++++---------- wcstools.spec | 11 +- 4 files changed, 53 insertions(+), 61 deletions(-) rename wcstools-3.9.4-rename-shlib.patch => wcstools-3.9.6-rename-shlib.patch (91%) diff --git a/.gitignore b/.gitignore index caaeb55..fcfbd92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,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 diff --git a/sources b/sources index 02c99d4..4023f26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wcstools-3.9.5.tar.gz) = aa48081b6f5dc12ed8d64eae5275c27aaa279856f588a3eb429ec0a4943dc482788cb7f84820233f0e2ee4fefeda7ab9bb85c4513a9942c48f5d97a0bde1581d +SHA512 (wcstools-3.9.6.tar.gz) = 13e4acf6ab733d7d3e75792d19550e7165b6d1d6e0475ccae6a75a6eef791c53ddad32d1c734930e8fa5218088ad02b1d601ef4c00b16e979ac3febbd5d22716 diff --git a/wcstools-3.9.4-rename-shlib.patch b/wcstools-3.9.6-rename-shlib.patch similarity index 91% rename from wcstools-3.9.4-rename-shlib.patch rename to wcstools-3.9.6-rename-shlib.patch index ae7b2c1..c4995ed 100644 --- a/wcstools-3.9.4-rename-shlib.patch +++ b/wcstools-3.9.6-rename-shlib.patch @@ -1,25 +1,45 @@ -From: Ole Streicher -Date: Fri, 5 Aug 2016 16:17:42 +0200 -Subject: Rename libwcs to libwcstools to avoid conflicts with Mark - Calabretta's wcslib package. - -Also, build a dynamic library and forward CFLAGS, CPPFLAGS and LDFLAGS for -fortification. ---- - Makefile | 134 ++++++++++++++++++++++++++++---------------------------- - libwcs/Makefile | 14 ++++-- - 2 files changed, 76 insertions(+), 72 deletions(-) - -diff --git a/Makefile b/Makefile -index 38a0337..296219c 100644 ---- a/Makefile -+++ b/Makefile +diff -U 3 -dHrN -- a/libwcs/Makefile b/libwcs/Makefile +--- a/libwcs/Makefile 2011-09-15 21:05:05.000000000 +0200 ++++ b/libwcs/Makefile 2020-06-27 18:40:25.837417862 +0200 +@@ -1,4 +1,4 @@ +-CFLAGS= -g -D_FILE_OFFSET_BITS=64 ++CFLAGS+= -fPIC + CC= cc + + OBJS = imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \ +@@ -11,10 +11,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 +74,4 @@ + worldpos.o: wcs.h fitshead.h wcslib.h + + clean: +- rm -f *.a *.o ++ rm -f *.a *.o *.so *.so.* +diff -U 3 -dHrN -- a/Makefile b/Makefile +--- a/Makefile 2018-11-06 03:55:26.000000000 +0100 ++++ b/Makefile 2020-06-27 18:32:28.022430111 +0200 @@ -1,12 +1,11 @@ -CFLAGS= -g -D_FILE_OFFSET_BITS=64 --CC= cc + 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 @@ -31,7 +51,7 @@ index 38a0337..296219c 100644 all: cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \ imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \ -@@ -16,187 +15,186 @@ all: cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \ +@@ -16,190 +15,190 @@ isfile simpos bincat addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h @@ -118,6 +138,10 @@ index 38a0337..296219c 100644 - $(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) @@ -279,41 +303,5 @@ index 38a0337..296219c 100644 rm -f ./bin/* -clean: -- make objclean; make binclean +clean: objclean binclean -diff --git a/libwcs/Makefile b/libwcs/Makefile -index ec2fae0..25e2eb6 100644 ---- a/libwcs/Makefile -+++ b/libwcs/Makefile -@@ -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 @@ OBJS = imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \ - 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 @@ webread.o: wcscat.h - worldpos.o: wcs.h fitshead.h wcslib.h - - clean: -- rm -f *.a *.o -+ rm -f *.a *.o *.so *.so.* + make objclean; make binclean diff --git a/wcstools.spec b/wcstools.spec index dcecdcc..fd05e6d 100644 --- a/wcstools.spec +++ b/wcstools.spec @@ -1,6 +1,6 @@ Name: wcstools -Version: 3.9.5 -Release: 11%{?dist} +Version: 3.9.6 +Release: 1%{?dist} Summary: Software utilities to display and manipulate the WCS of a FITS image License: GPLv2+ URL: http://tdc-www.harvard.edu/wcstools @@ -10,7 +10,7 @@ BuildRequires: gcc # Patch from Debian to create shared lib and rename it to avoid # conflicts with Mark Calabretta's wcslib package. -Patch0: wcstools-3.9.4-rename-shlib.patch +Patch0: wcstools-3.9.6-rename-shlib.patch %description Wcstools is a set of software utilities, written in C, which create, @@ -79,7 +79,7 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %files libs %license libwcs/COPYING -%{_libdir}/*.so.* +%{_libdir}/*.so.1* %files devel %doc libwcs/NEWS @@ -88,6 +88,9 @@ mv %{buildroot}%{_bindir}/remap %{buildroot}%{_bindir}/wcsremap %changelog +* 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 From e1bb36936628814e8b9bad5fba03da759b6d5304 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:01:17 +0000 Subject: [PATCH 43/62] - 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 44/62] 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 45/62] - 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 46/62] - 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 47/62] - 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 48/62] 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 49/62] 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 50/62] 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 51/62] 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 52/62] 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 53/62] 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 54/62] 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 55/62] 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 56/62] 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 57/62] 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 58/62] 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 59/62] 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 60/62] 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 61/62] 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 62/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild