packages: cfitsio/cfitsio.spec, cfitsio/cfitsio-zlib.patch (NEW), cfitsio/c...

[qboosh]

Author: qboosh                       Date: Mon Aug 22 06:35:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.280
- gzip code has been removed, so removed obsolete compress patch and GPL is no longer enforced
- added zlib patch to use system zlib instead of internal copy

---- Files affected:
packages/cfitsio:
   cfitsio.spec (1.19 -> 1.20) , cfitsio-zlib.patch (NONE -> 1.1)  (NEW), cfitsio-compress.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/cfitsio/cfitsio.spec
diff -u packages/cfitsio/cfitsio.spec:1.19 packages/cfitsio/cfitsio.spec:1.20
--- packages/cfitsio/cfitsio.spec:1.19	Sun Jun 20 19:17:47 2010
+++ packages/cfitsio/cfitsio.spec	Mon Aug 22 08:35:09 2011
@@ -2,19 +2,19 @@
 Summary:	CFITSIO Interface Library
 Summary(pl.UTF-8):	Biblioteka interfejsu CFITSIO
 Name:		cfitsio
-Version:	3.250
+Version:	3.280
 %define	sver	%(echo %{version} | tr -d .)
 Release:	1
-License:	GPL (forced only by gzip code, basically BSD-like)
+License:	MIT-like
 Group:		Libraries
 Source0:	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/%{name}%{sver}.tar.gz
-# Source0-md5:	1e6e390f21fab4e04781156fddcd2f8b
+# Source0-md5:	fdb9c0f51678b47e78592c70fb5dc793
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-ldflags.patch
-Patch2:		%{name}-compress.patch
+Patch2:		%{name}-zlib.patch
 URL:		http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
 BuildRequires:	gcc-g77
-BuildRequires:	sed >= 4.0
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,6 +32,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do CFITSIO
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	zlib-devel
 
 %description devel
 Header files and development documentation for CFITSIO.
@@ -55,9 +56,10 @@
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p0
-%patch2 -p0
+%patch2 -p1
 
-sed -i -e 's/ f77 xlf / gfortran f77 xlf /' configure
+# enforce headers from system zlib
+%{__rm} crc32.h deflate.h inffast.h inffixed.h inflate.h inftrees.h zconf.h zlib.h zutil.h
 
 %build
 %configure
@@ -101,6 +103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/08/22 06:35:09  qboosh
+- updated to 3.280
+- gzip code has been removed, so removed obsolete compress patch and GPL is no longer enforced
+- added zlib patch to use system zlib instead of internal copy
+
 Revision 1.19  2010/06/20 17:17:47  qboosh
 - updated to 3.250
 

================================================================
Index: packages/cfitsio/cfitsio-zlib.patch
diff -u /dev/null packages/cfitsio/cfitsio-zlib.patch:1.1
--- /dev/null	Mon Aug 22 08:35:14 2011
+++ packages/cfitsio/cfitsio-zlib.patch	Mon Aug 22 08:35:09 2011
@@ -0,0 +1,31 @@
+--- cfitsio/Makefile.in.orig	2011-08-22 08:20:52.649373665 +0200
++++ cfitsio/Makefile.in	2011-08-22 08:26:21.099373501 +0200
+@@ -55,9 +55,7 @@ CORE_SOURCES = 	buffers.c cfileio.c chec
+ 		putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
+ 		putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
+ 		swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
+-		pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \
+-		adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
+-		deflate.c infback.c inflate.c uncompr.c \
++		pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c
+ 
+ SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@
+ 
+@@ -90,7 +88,7 @@ libcfitsio.a:	${OBJECTS}
+ shared: libcfitsio${SHLIB_SUFFIX}
+ 
+ libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
+-		${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm
++		${SHLIB_LD} ${LDFLAGS} -o $@ ${OBJECTS} -lm -lz
+ 
+ install:	libcfitsio.a $(INSTALL_DIRS)
+ 		@if [ -f libcfitsio.a ]; then \
+--- cfitsio/cfitsio.pc.in.orig	2011-05-12 20:35:39.000000000 +0200
++++ cfitsio/cfitsio.pc.in	2011-08-22 08:26:36.306040160 +0200
+@@ -7,5 +7,5 @@ Name: cfitsio
+ Description: FITS File Subroutine Library
+ Version: 3.28
+ Libs: -L${libdir} -lcfitsio @LIBS@
+-Libs.private: -lm
++Libs.private: -lm -lz
+ Cflags: -I${includedir}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cfitsio/cfitsio.spec?r1=1.19&r2=1.20&f=u