dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-wcstools-3.6.6beta.tar.gz

.gitignore

@@ -0,0 +1 @@
+wcstools-3.6.8.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: wcstools
-# $Id$
-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
-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)

sources

@@ -1 +1 @@
-cc7bdf13772282618c094d4baf54e800  wcstools-3.6.6beta.tar.gz
+bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz

wcstools.spec

@@ -1,15 +1,16 @@
 Name: wcstools
-Version: 3.6.6
+Version: 3.7.0
-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
+License: GPLv2+
 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)
+Patch2: wcstools3-bug232413.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
 Wcstools is a set of software utilities, written in C, which create,
@@ -21,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
@@ -32,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.
@@ -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,23 +84,49 @@ This are the files needed to develop an application using libwcs.
 
 
 %changelog
+* Wed Sep 05 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.7.0-1
+- New upstream source 3.7.0
+
+* Mon Aug 27 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 3.6.8-2.1
+- Rebuild for Fedora 8 to get the build-id
+
+* Tue Mar 20 2007 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.8-2
+- Fix for bug #232413
+
+* Mon Mar 19 2007 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.8-1
+- New upstream source 3.6.8
+- Added pacthes to remove warnings during the compilation
+
+* Mon Feb 26 2007 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.7-1
+- New upstream source 3.6.7
+
+* Wed Nov 15 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.6-1
+- New upstream source 3.6.6
+
 * Tue Oct 10 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.6-0.1.beta
 - New upstream source 3.6.6beta
+
 * Mon Sep 4 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.5-3
 - Rebuild.
+
 * Wed Aug 30 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.5-2
 - Corrected bug in edhead (patch2) (bug #204642).
+
 * Fri Jun 21 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.5-1
 - New upstream source 3.6.5
+
 * Tue Jun 13 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.4-3
 - Patched overflows in catutil.c and getdate.c
 - Patched incompatible pointer in binread.c
+
 * Mon Jun 12 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 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 <spr@astrax.fis.ucm.es> 3.6.4-1
 - Removed not needed ldconfig in wcstools and libwcs-devel.
+
 * Wed Mar 08 2006 Sergio Pascual <spr@astrax.fis.ucm.es> 3.6.3-1
 - Initial RPM file.

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);

wcstools3-shared.patch

@@ -1,15 +1,8 @@
-diff -ur wcstools-3.6.4.orig/libwcs/Makefile wcstools-3.6.4/libwcs/Makefile
+diff -ur wcstools-3.6.7.old/libwcs/Makefile wcstools-3.6.7/libwcs/Makefile
---- wcstools-3.6.4.orig/libwcs/Makefile	2006-04-19 22:10:07.000000000 +0200
+--- wcstools-3.6.7.old/libwcs/Makefile	2007-01-10 20:26:36.000000000 +0100
-+++ wcstools-3.6.4/libwcs/Makefile	2006-06-12 13:24:01.000000000 +0200
++++ wcstools-3.6.7/libwcs/Makefile	2007-02-26 15:42:32.000000000 +0100
-@@ -1,5 +1,4 @@
+@@ -11,10 +11,18 @@
--CFLAGS= -g
+ 	sortstar.o platefit.o iget.o fileutil.o \
--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
@@ -22,32 +15,33 @@ 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.8.old/Makefile	2007-02-28 21:44:24.000000000 +0100
---- wcstools-3.6.4.orig/Makefile	2006-04-26 00:14:19.000000000 +0200
++++ wcstools-3.6.8/Makefile	2007-03-19 17:36:28.000000000 +0100
-+++ wcstools-3.6.4/Makefile	2006-06-12 13:19:10.000000000 +0200
+@@ -1,6 +1,6 @@
-@@ -1,8 +1,5 @@
+ CFLAGS= -g
--CFLAGS= -g
+ CC= cc
--CC= cc
 -LIBWCS = libwcs/libwcs.a
--LIBS = $(LIBWCS) -lm
++LIBWCS = -L`pwd`/libwcs -lwcs
--#CATLIBS = $(LIBS) -lnsl -lsocket
+ LIBS = $(LIBWCS) -lm
-+LIBWCS = libwcs/libwcs.so
+ #CATLIBS = $(LIBS) -lnsl -lsocket
-+LIBS = -L./libwcs -lwcs -lm
  CATLIBS = $(LIBS)
- BIN = bin
+@@ -19,10 +19,10 @@
- .PRECIOUS: ${LIBWCS}
+ 	$(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS)
-@@ -22,7 +19,7 @@
+ 
- 	$(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(CATLIBS)
+ 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 +49,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 +58,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
@@ -81,3 +75,29 @@ diff -ur wcstools-3.6.4.orig/Makefile wcstools-3.6.4/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 */