rpms/funtools/EL-5 Makefile, 1.2, 1.3 funtools-makefile.patch, 1.2, 1.3 funtools-wcs.patch, 1.2, 1.3 funtools.spec, 1.5, 1.6 sources, 1.6, 1.7
Sergio Pascual (sergiopr)
fedora-extras-commits at redhat.com
Thu Jul 17 08:09:00 UTC 2008
- Previous message (by thread): rpms/pcmanfm/devel pcmanfm-0.5-kill-find-immediately.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 pcmanfm.spec, 1.21, 1.22 sources, 1.18, 1.19
- Next message (by thread): rpms/funtools/EL-5 .cvsignore,1.2,1.3 funtools.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sergiopr
Update of /cvs/pkgs/rpms/funtools/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32342
Added Files:
Makefile funtools-makefile.patch funtools-wcs.patch
funtools.spec sources
Log Message:
Creating EL-5 branch
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ Makefile 17 Jul 2008 08:08:04 -0000 1.3
@@ -0,0 +1,21 @@
+# Makefile for source rpm: funtools
+# $Id$
+NAME := funtools
+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)
funtools-makefile.patch:
Index: funtools-makefile.patch
===================================================================
RCS file: funtools-makefile.patch
diff -N funtools-makefile.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ funtools-makefile.patch 17 Jul 2008 08:08:04 -0000 1.3
@@ -0,0 +1,422 @@
+diff -ur funtools-1.3.0b29/filter/Makefile.in funtools-1.3.0b29.new/filter/Makefile.in
+--- funtools-1.3.0b29/filter/Makefile.in 2006-03-20 19:42:11.000000000 +0100
++++ funtools-1.3.0b29.new/filter/Makefile.in 2007-03-26 10:47:02.000000000 +0200
+@@ -29,6 +29,25 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++host_alias = @host_alias@
++includedir = @includedir@
++nfodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -38,13 +57,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/filt
+
+ # util files are in the util directory at same level
+ UTIL_INC = -I../util
+@@ -55,7 +74,7 @@
+ #FITSY_LIBS = -L../fitsy
+
+ # wcs files are in the wcs subdirectory
+-WCS_INC = -I../wcs
++WCS_INC = -I/usr/include/wcs
+ #WCS_LIBS = -L../wcs -lwcs
+
+ # extra includes for compiling
+@@ -161,7 +180,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+diff -ur funtools-1.3.0b29/fitsy/Makefile.in funtools-1.3.0b29.new/fitsy/Makefile.in
+--- funtools-1.3.0b29/fitsy/Makefile.in 2006-10-30 17:51:58.000000000 +0100
++++ funtools-1.3.0b29.new/fitsy/Makefile.in 2007-03-26 10:47:02.000000000 +0200
+@@ -28,6 +28,25 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++host_alias = @host_alias@
++includedir = @includedir@
++nfodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -37,13 +56,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/fitsy
+
+ # There are just too many different versions of "install" around;
+ # better to use the install-sh script that comes with the distribution,
+diff -ur funtools-1.3.0b29/Makefile.in funtools-1.3.0b29.new/Makefile.in
+--- funtools-1.3.0b29/Makefile.in 2007-02-28 18:50:16.000000000 +0100
++++ funtools-1.3.0b29.new/Makefile.in 2007-03-26 10:48:41.000000000 +0200
+@@ -37,19 +37,19 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a or .so binary for the FUNTOOLS library:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the funtools.h include file:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools
+
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/funtools
++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/funtools
+
+ # util files are in the util subdirectory
+ UTIL_INC = -I./util
+@@ -60,7 +60,7 @@
+ # FITSY_LIBS = -L./fitsy -lfitsy
+
+ # wcs files are in the wcs subdirectory
+-WCS_INC = -I./wcs
++WCS_INC = -I/usr/include/wcs
+ # WCS_LIBS = -L./wcs -lwcs
+
+ # filter files are in the filter subdirectory
+@@ -74,7 +74,7 @@
+ EXTRA_LIBS = @EXTRA_LIBS@
+
+ # the full set of libraries for linking
+-LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(WCS_LIBS) $(FITSY_LIBS) \
++LIBS = $(UTIL_LIBS) $(FILTER_LIBS) $(FITSY_LIBS) \
+ $(EXTRA_LIBS) -lm
+
+ # To change the compiler switches, for example to change from -O
+@@ -111,6 +111,30 @@
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_DATA = ${INSTALL} -m 644
+
++# Added by fedora rpm patch
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++includedir = @includedir@
++nfodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++# end
++
++
+ # which awk-like program do we have?
+ PRE= @PRE@
+ POST= @POST@
+@@ -160,7 +184,7 @@
+
+ # this is used in the link line
+ # LLIB = $(LIB)
+-LLIB = @LLIB@
++LLIB = @LLIB@
+
+ # libraries containing main as subroutines
+ MAINLIB = lib$(PACKAGE)MainLib.a
+@@ -225,10 +249,10 @@
+ echo $(PROGS) | ./mkfunmainlib > funmainlib.c;
+
+ shlib: sublib $(LIBOBJS)
+- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../$(LIB)); \
+ CC='$(CC)' CXX=$(CXX) \
+- ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o; \
++ ./mklib -o $(PACKAGE) $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \
+ rm -rf $(PACKAGE)tmp;)
+
+ mainlib: $(MAINLIBOBJS) funmainlib.o lex.calc.o
+@@ -237,7 +261,7 @@
+ $(RANLIB) lib$(PACKAGE)MainLib.a)
+
+ shmainlib: mainlib
+- @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
++ @(rm -rf $(PACKAGE)tmp; mkdir -p $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
+ CC='$(CC)' CXX='$(CXX)' \
+ ./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\
+@@ -251,7 +275,7 @@
+ @(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ (cd $(PACKAGE)tmp && ar x ../$(LIB) && ar x ../libtclfun.a); \
+ CC='$(CC)' CXX='$(CXX)' \
+- ./mklib -o tclfun $(PACKAGE)tmp/*.o; \
++ ./mklib -o tclfun $(PACKAGE)tmp/*.o $(EXTRA_LIBS) -lm; \
+ rm -rf $(PACKAGE)tmp; \
+ test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
+ SHLIB=libtclfun.so; \
+@@ -370,6 +394,7 @@
+
+ funtools.ds9: funtools_ds9.tmpl
+ sed -e 's#PRE#$(PRE)#g;s#POST#$(POST)#g;s#GUNZIP#$(GUNZIP)#g' funtools_ds9.tmpl > funtools.ds9
++ chmod +x funtools.ds9
+
+ diff:
+ @-(for file in "`ls *.c`"; \
+@@ -413,7 +438,7 @@
+ else \
+ echo "Installing $$i" ; \
+ $(INSTALL_DATA) $$i $(LIB_INSTALL_DIR)/$$i ; \
+- chmod 555 $(LIB_INSTALL_DIR)/$$i; \
++ chmod 755 $(LIB_INSTALL_DIR)/$$i; \
+ fi; \
+ done;)
+
+@@ -422,7 +447,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -432,7 +457,7 @@
+ echo "Installing $$XLIB"; \
+ $(INSTALL_DATA) $$XLIB $(LIB_INSTALL_DIR)/$$XLIB; \
+ (cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \
+- chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \
++ chmod 755 $(LIB_INSTALL_DIR)/$$XLIB; \
+ fi;
+ @echo "Installing funtools.h"
+ @$(INSTALL_DATA) funtools.h $(INCLUDE_INSTALL_DIR)/funtools.h
+@@ -462,7 +487,7 @@
+ install-man:
+ @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ echo "Making directory $(MAN_INSTALL_DIR)"; \
+- mkdir $(MAN_INSTALL_DIR); \
++ mkdir -p $(MAN_INSTALL_DIR); \
+ chmod 755 $(MAN_INSTALL_DIR); \
+ else true; \
+ fi;
+@@ -473,7 +498,7 @@
+ M="$(MAN_INSTALL_DIR)/man$$E"; \
+ if [ ! -d $$M ] ; then \
+ echo "Making directory $$M"; \
+- mkdir $$M; \
++ mkdir -p $$M; \
+ chmod 755 $$M; \
+ else true; \
+ fi; \
+diff -ur funtools-1.3.0b29/util/Makefile.in funtools-1.3.0b29.new/util/Makefile.in
+--- funtools-1.3.0b29/util/Makefile.in 2007-02-09 17:37:53.000000000 +0100
++++ funtools-1.3.0b29.new/util/Makefile.in 2007-03-26 10:47:02.000000000 +0200
+@@ -28,7 +28,26 @@
+ # to the "configure" script.
+
+ prefix = @prefix@
+-exec_prefix = @exec_prefix@
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++includedir = @includedir@
++nfodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -38,13 +57,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a, .so, and .o files:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the programs:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include files:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools/util
+
+ # extra includes for compiling
+ INCLUDES =
+@@ -174,7 +193,7 @@
+ $(CC) -I$(ZDIR) -c $(CFLAGS) $(ZDIR)/inffast.c
+
+ gio.o: gio.c gio.h
+- $(CC) -c $(CC_SWITCHES) -I$(ZDIR) gio.c
++ $(CC) -c $(CC_SWITCHES) gio.c
+
+ gcat.o: gcat.c gio.h
+
+@@ -192,7 +211,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+diff -ur funtools-1.3.0b29/wcs/Makefile.in funtools-1.3.0b29.new/wcs/Makefile.in
+--- funtools-1.3.0b29/wcs/Makefile.in 2006-11-30 19:46:29.000000000 +0100
++++ funtools-1.3.0b29.new/wcs/Makefile.in 2007-03-26 10:47:02.000000000 +0200
+@@ -27,7 +27,26 @@
+ # to the "configure" script.
+
+ prefix = @prefix@
+-exec_prefix = @exec_prefix@
++bindir = @bindir@
++build_alias = @build_alias@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host_alias = @host_alias@
++includedir = @includedir@
++nfodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -37,13 +56,13 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a or .so binary for the WCS library:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include file wcs.h:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/funtools
+
+ # To change the compiler switches, for example to change from -O
+ # to -g, change the following line:
+@@ -136,7 +155,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -148,12 +167,12 @@
+ (cd $(LIB_INSTALL_DIR); $(RANLIB) $$XLIB); \
+ chmod 555 $(LIB_INSTALL_DIR)/$$XLIB; \
+ fi;
+- @echo "Installing fitshead.h"
+- @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h
+- @echo "Installing wcs.h"
+- @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h
+- @echo "Installing wcslib.h"
+- @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h
++ @echo "Skipping fitshead.h"
++# @$(INSTALL_DATA) fitshead.h $(INCLUDE_INSTALL_DIR)/fitshead.h
++ @echo "Skipping wcs.h"
++# @$(INSTALL_DATA) wcs.h $(INCLUDE_INSTALL_DIR)/wcs.h
++ @echo "Skipping wcslib.h"
++# @$(INSTALL_DATA) wcslib.h $(INCLUDE_INSTALL_DIR)/wcslib.h
+
+ Makefile: Makefile.in
+ $(SHELL) config.status
funtools-wcs.patch:
Index: funtools-wcs.patch
===================================================================
RCS file: funtools-wcs.patch
diff -N funtools-wcs.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ funtools-wcs.patch 17 Jul 2008 08:08:04 -0000 1.3
@@ -0,0 +1,84 @@
+diff -ur funtools-1.4.0/filter/filter.h funtools-1.4.0.new/filter/filter.h
+--- funtools-1.4.0/filter/filter.h 2007-01-04 17:54:21.000000000 +0100
++++ funtools-1.4.0.new/filter/filter.h 2007-10-16 09:48:28.000000000 +0200
+@@ -46,7 +46,7 @@
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+ #include <idx.h>
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ #include <column.h>
+ #include <tl.h>
+ #include <dl.h>
+diff -ur funtools-1.4.0/funcen.c funtools-1.4.0.new/funcen.c
+--- funtools-1.4.0/funcen.c 2006-11-01 17:35:16.000000000 +0100
++++ funtools-1.4.0.new/funcen.c 2007-10-16 09:48:49.000000000 +0200
+@@ -21,7 +21,7 @@
+ #include <filter.h>
+ #include <swap.h>
+ #include <word.h>
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ #include <xalloc.h>
+
+ #define MAXROW 8192
+diff -ur funtools-1.4.0/funmerge.c funtools-1.4.0.new/funmerge.c
+--- funtools-1.4.0/funmerge.c 2007-03-05 16:42:15.000000000 +0100
++++ funtools-1.4.0.new/funmerge.c 2007-10-16 09:49:07.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ #include <funtools.h>
+ #include <fitsy.h>
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ #include <gio.h>
+ #include <tl.h>
+ #include <word.h>
+diff -ur funtools-1.4.0/funtools.h funtools-1.4.0.new/funtools.h
+--- funtools-1.4.0/funtools.h 2007-08-03 19:12:10.000000000 +0200
++++ funtools-1.4.0.new/funtools.h 2007-10-16 09:48:01.000000000 +0200
+@@ -31,7 +31,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ typedef void *Fun;
+ #endif
+
+diff -ur funtools-1.4.0/funtoolsP.h funtools-1.4.0.new/funtoolsP.h
+--- funtools-1.4.0/funtoolsP.h 2007-07-31 19:04:49.000000000 +0200
++++ funtools-1.4.0.new/funtoolsP.h 2007-10-16 09:49:23.000000000 +0200
+@@ -36,7 +36,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ #include <filter.h>
+ #include <file.h>
+ #include <swap.h>
+diff -ur funtools-1.4.0/funwcs.c funtools-1.4.0.new/funwcs.c
+--- funtools-1.4.0/funwcs.c 2007-06-11 19:13:06.000000000 +0200
++++ funtools-1.4.0.new/funwcs.c 2007-10-16 09:49:36.000000000 +0200
+@@ -3,7 +3,7 @@
+ */
+
+ #include <funtoolsP.h>
+-#include <wcs.h>
++#include <wcs/wcs.h>
+
+ /*
+ *
+diff -ur funtools-1.4.0/ofuntools.h funtools-1.4.0.new/ofuntools.h
+--- funtools-1.4.0/ofuntools.h 2007-06-11 23:13:24.000000000 +0200
++++ funtools-1.4.0.new/ofuntools.h 2007-10-16 09:49:49.000000000 +0200
+@@ -31,7 +31,7 @@
+ #define USE_XFILEIO 1
+ #include <fitsy.h>
+ #undef USE_XFILEIO
+-#include <wcs.h>
++#include <wcs/wcs.h>
+ typedef void *Fun;
+ #endif
+
Index: funtools.spec
===================================================================
RCS file: funtools.spec
diff -N funtools.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ funtools.spec 17 Jul 2008 08:08:04 -0000 1.6
@@ -0,0 +1,119 @@
+Name: funtools
+Version: 1.4.0
+Release: 3%{?dist}
+Summary: FITS library and utilities
+
+# Upstream version
+%define upversion 1.4.0
+
+Group: Applications/Engineering
+License: LGPLv2+
+URL: http://hea-www.harvard.edu/RD/funtools/
+Source0: http://hea-www.harvard.edu/saord/download/funtools/%{name}-%{upversion}.tar.gz
+Patch0: funtools-makefile.patch
+Patch1: funtools-wcs.patch
+Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires: libwcs-devel tcl-devel zlib-devel
+BuildRequires: pkgconfig
+Requires: gnuplot
+Requires: %{name}-libs = %{version}-%{release}
+
+%description
+Funtools, is a "minimal buy-in" FITS library and utility package from
+the SAO/HEAD R&D group. The Funtools library provides simplified access to
+FITS images and binary tables, as well as to raw array and binary event lists.
+The Funtools utilities provide high-level support for processing
+astronomical data.
+This package contains command-line utilities for managing FITS files.
+
+%package devel
+Summary: Headers for developing programs that will use %{name}
+Group: Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
+
+%description devel
+These are the header files and libraries needed to develop a %{name}
+application.
+
+%package libs
+Summary: A general purpose FITS library
+Group: System Environment/Libraries
+%description libs
+qfits is a stand-alone C library offering easy access to FITS (Flexible Image
+ Transport System) files.
+This package contains the %{name} run-time library
+
+%prep
+%setup -q -n %{name}-%{upversion}
+%patch0 -p1
+
+%build
+%configure --enable-shared=link --with-wcslib=%{_libdir}/libwcs.so \
+ --with-zlib=%{_libdir}/libz.so --with-tcl=%{_libdir} --enable-dl
+# Parallel build does not work currently
+%{__make} EXTRA_LIBS="-lwcs -lz -ldl"
+%{__make} shtclfun EXTRA_LIBS="-ltcl -lwcs -lz -ldl"
+
+%install
+%{__rm} -fr %{buildroot}
+%{__make} INSTALL_ROOT=%{buildroot} INSTALL="%{__install} -p" install
+mv %{buildroot}/%{_bindir}/funtools.ds9 %{buildroot}/%{_datadir}/funtools
+mv %{buildroot}/%{_bindir}/funcalc.sed %{buildroot}/%{_datadir}/funtools
+# Bug #329741
+%{__install} -p -m 644 fitsy/*.h %{buildroot}%{_includedir}/%{name}/fitsy
+
+
+%clean
+%{__rm} -fr %{buildroot}
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/%{name}
+
+%files libs
+%defattr(-,root,root,-)
+%doc COPYING
+%{_libdir}/*so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/*.html
+%doc doc/*.pdf
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/funtools.pc
+%exclude %{_libdir}/*.a
+%{_includedir}/*
+%{_mandir}/man3/*
+%{_mandir}/mann/*
+
+%changelog
+* Tue Oct 16 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-3
+- Fixing wcs headers
+* Sat Oct 13 2007 Sergio Pascual <sergiopr at fedoraproject dot org> 1.4.0-2
+- Fixing bug #329741
+- Splitting libs in funtools-libs
+* Mon Aug 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.4.0-1
+- New upstream version, changed license and buildroot lines
+* Sun Jul 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.5.b34
+- New upstream version
+* Thu May 03 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.5.b33
+- New upstream version
+* Mon Mar 26 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.4.b29
+- Funtools Approved
+- Parallel make does not work
+- Problem with undefined non weak symbols in libtclfun fixed
+* Fri Mar 23 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.3.b29
+- Removed _smp_mflags
+* Thu Mar 22 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.2.b29
+- Updated funtools-makefile.patch
+- Added EXTRA_LIBS to compilation step
+* Tue Mar 20 2007 Sergio Pascual <spr at astrax.fis.ucm.es> 1.3.0-0.1.b29
+- Initial spec file
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 17 Jul 2008 08:08:04 -0000 1.7
@@ -0,0 +1 @@
+8079d723e1424141c3f2bc4ea9b323db funtools-1.4.0.tar.gz
- Previous message (by thread): rpms/pcmanfm/devel pcmanfm-0.5-kill-find-immediately.patch, NONE, 1.1 .cvsignore, 1.18, 1.19 pcmanfm.spec, 1.21, 1.22 sources, 1.18, 1.19
- Next message (by thread): rpms/funtools/EL-5 .cvsignore,1.2,1.3 funtools.spec,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list