rpms/wcstools/F-12 sources, 1.7, 1.8 wcstools.spec, 1.17, 1.18 wcstools3-shared.patch, 1.7, 1.8 wcstools3-bug232413.patch, 1.1, NONE wcstools3-codewarn.patch, 1.5, NONE

Sergio Pascual sergiopr at fedoraproject.org
Wed Feb 3 18:13:18 UTC 2010 

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26965

Modified Files:
	sources wcstools.spec wcstools3-shared.patch 
Removed Files:
	wcstools3-bug232413.patch wcstools3-codewarn.patch 
Log Message:
* Tue Feb 03 2010 Sergio Pascual <sergiopr at fedoraproject.org> 3.8.1-1
- New upstream source
- Patch to fix bz #559863 from upstream



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	7 Sep 2007 20:16:11 -0000	1.7
+++ sources	3 Feb 2010 18:13:18 -0000	1.8
@@ -1 +1 @@
-bda2748ab4a60e196e3621cc7fa47eda  wcstools-3.7.0.tar.gz
+f70c3f94dd9ec110515571f336da4110  wcstools-3.8.1.tar.gz


Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-12/wcstools.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- wcstools.spec	27 Jul 2009 07:06:49 -0000	1.17
+++ wcstools.spec	3 Feb 2010 18:13:18 -0000	1.18
@@ -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 imag
 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,15 +34,13 @@ Summary: Libraries, includes, etc. used 
 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.
+These are the files needed to develop an application using wcstools.
 
 %prep
 %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 
 
 %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 <sergiopr at fedoraproject.org> 3.8.1-1
+- New upstream source
+- Patch to fix bz #559863 from upstream
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.7.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

wcstools3-shared.patch:
 Makefile        |    2 +-
 libwcs/Makefile |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/F-12/wcstools3-shared.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- wcstools3-shared.patch	19 Feb 2009 08:51:20 -0000	1.7
+++ wcstools3-shared.patch	3 Feb 2010 18:13:18 -0000	1.8
@@ -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/Makef
  	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


--- wcstools3-bug232413.patch DELETED ---


--- wcstools3-codewarn.patch DELETED ---

More information about the scm-commits mailing list