[avl] Update to 3.35
Sandro Mani
smani at fedoraproject.org
Wed Feb 12 19:39:05 UTC 2014
commit 1f56b882d05089bd338ba7b3e13960a75db01ab4
Author: Sandro Mani <manisandro at gmail.com>
Date: Wed Feb 12 20:39:35 2014 +0100
Update to 3.35
.gitignore | 1 +
avl.spec | 11 +-
avl3.32-makefile.patch => avl3.35-makefile.patch | 192 +++++++---------------
sources | 2 +-
4 files changed, 67 insertions(+), 139 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6024ea..4b88cd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/libavl_0.3.5.orig.tar.gz
/avl3.32.tgz
+/avl3.35.tgz
diff --git a/avl.spec b/avl.spec
index 894100a..0be56b9 100644
--- a/avl.spec
+++ b/avl.spec
@@ -1,6 +1,6 @@
Name: avl
-Version: 3.32
-Release: 5%{?dist}
+Version: 3.35
+Release: 1%{?dist}
Summary: Aerodynamic and flight-dynamic analysis of rigid aircrafts
# Plotlib is LGPLv2+, the rest is GPLv2+
@@ -11,7 +11,7 @@ Source0: http://web.mit.edu/drela/Public/web/avl/avl%{version}.tgz
Source1: LICENSE.GPL
Source2: LICENSE.LGPL
# Makefile variables and flags
-Patch0: avl3.32-makefile.patch
+Patch0: avl3.35-makefile.patch
BuildRequires: gcc-gfortran libX11-devel
Requires: xorg-x11-fonts-misc
@@ -31,7 +31,7 @@ together with specified mass properties.
%prep
%setup -q -n Avl
-%patch0 -p2
+%patch0 -p1
cp %{SOURCE1} .
cp %{SOURCE2} .
@@ -55,6 +55,9 @@ make %{?_smp_mflags} -C bin
%changelog
+* Wed Feb 12 2014 Sandro Mani <manisandro at gmail.com> - 3.35-1
+- Update to version 3.35
+
* Sat Jan 25 2014 Sandro Mani <manisandro at gmail.com> - 3.32-5
- Rebuild without-fdefault-real-8
diff --git a/avl3.32-makefile.patch b/avl3.35-makefile.patch
similarity index 57%
rename from avl3.32-makefile.patch
rename to avl3.35-makefile.patch
index b01a0c4..6463689 100644
--- a/avl3.32-makefile.patch
+++ b/avl3.35-makefile.patch
@@ -1,12 +1,11 @@
-diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
---- avl3.32/Avl/bin/Makefile 2010-12-05 20:34:10.000000000 +0100
-+++ avl3.32-new/Avl/bin/Makefile 2013-09-12 18:45:01.007658014 +0200
-@@ -2,9 +2,17 @@
+diff -rupN Avl/bin/Makefile Avl-new/bin/Makefile
+--- Avl/bin/Makefile 2013-10-07 01:34:54.000000000 +0200
++++ Avl-new/bin/Makefile 2014-02-12 20:34:05.100898283 +0100
+@@ -2,8 +2,17 @@
# Makefile for AVL
#
--BINDIR = .
--BINDIR = /home/codes/bin
+-BINDIR = /home/codes/bin/
-INSTALLCMD = install -s
+FC = gfortran
+
@@ -15,29 +14,31 @@ diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
+
+# override FFLAGS += -fdefault-real-8
+
-+PLTOBJ = ../plotlib/libPltDP.a
++PLTOBJ = ../plotlib/libPlt.a
+PLTLIB = -lX11
+
+EIGOBJ = ../eispack/eispack.a
SRC = ../src
-@@ -19,80 +27,24 @@ userio.o plutil.o arrow3d.o getvm.o \
+@@ -18,103 +27,23 @@ userio.o plutil.o arrow3d.o getvm.o \
matrix.o spline.o sgutil.o \
second.o
-PLTOBJ = ../plotlib/libPlt.a
-EIGOBJ = ../eispack/eispack.a
-## EIGOBJ = eispack.o
-
+-
###================================================
-### Default compilers and flags
-FC = f77
-FFLAGS = -O
-PLTLIB = -lX11
-FTNLIB =
+-
-#Subroutine SECOND source file
-SECOND = second_g77.f
+-
-##--------------------------
-
-# Uncomment flags for desired machine...
@@ -75,14 +76,35 @@ diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
-FFLAGS = -O
-PLTLIB = -L/usr/X11R6/lib -lX11
-SECOND = second_ifc.f
--#FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o
--#FTNLIB = -Vaxlib -i_dynamic
-#FTNLIB = -Vaxlib
-##--------------------------
-### double-precision option (also need double precision Eispack and libPlt)
-FFLAGS = -O -r8
--PLTOBJ = ../plotlib/libPltDP.a
--#PLTOBJ = -lPltDP
+-PLTOBJ = ../plotlib/libPltDP.a
+-
+-##---------------------------------------
+-## Uncomment for Mac OSX gfortran
+-FC = gfortran
+-
+-ACHK = -fbounds-check -finit-real=inf -ffpe-trap=invalid,zero,denormal
+-#ACHK =
+-
+-
+-#FTNLIB = -Vaxlib
+-FTNLIB =
+-SECOND = second_g77.f
+-
+-DP =
+-PLTOBJ = ../plotlib/libPlt_gSP.a
+-EIGOBJ = ../eispack/eispack_gSP.a
+-
+-#DP = -fdefault-real-8
+-#PLTOBJ = ../plotlib/libPltDP.a
+-#EIGOBJ = ../eispack/eispack_gDP.a
+-
+-FFLAGS = -O -m64 $(ACHK) $(DP)
+-##---------------------------------------
+-
all: $(PROGS)
@@ -94,8 +116,8 @@ diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
clean:
- -/bin/rm $(PROGS)
- -/bin/rm *.o
-+ rm -r $(PROGS)
-+ rm -r *.o
++ rm $(PROGS)
++ rm *.o
$(SRC)/AVL.INC: $(SRC)/AINDEX.INC
touch $(SRC)/AVL.INC
@@ -106,123 +128,26 @@ diff -rupN avl3.32/Avl/bin/Makefile avl3.32-new/Avl/bin/Makefile
dtest: dtest.o
$(FC) -o dtest dtest.o
-diff -rupN avl3.32/Avl/bin/Makefile_gfortran avl3.32-new/Avl/bin/Makefile_gfortran
---- avl3.32/Avl/bin/Makefile_gfortran 2010-08-17 18:22:09.000000000 +0200
-+++ avl3.32-new/Avl/bin/Makefile_gfortran 2013-09-12 18:07:41.355484623 +0200
-@@ -2,9 +2,6 @@
- # Makefile for AVL
- #
-
--BINDIR = ~/bin/
--INSTALLCMD = install -s
--
- SRC = ../src
-
- PROGS = avl
-@@ -24,78 +21,18 @@ EIGOBJ = ../eispack/eispack.a
-
- ###================================================
- ### Default compilers and flags
--FC = f77
--FFLAGS = -O
--PLTLIB = -lX11
--FTNLIB =
--
--#Subroutine SECOND source file
--SECOND = second_g77.f
--
--##--------------------------
--
--# Uncomment flags for desired machine...
--
--##--------------------------
--### DEC Alpha with OSF and DEC f77/f90 compiler
--#FC = f77
--#FFLAGS = -fast -O4 -tune host
--##--------------------------
--### SGI setup
--#FC = f77
--#FFLAGS = -O2
--##--------------------------
--## Uncomment for RS/6000
--#FFLAGS = -O -qextname
--##--------------------------
--## Uncomment for HP-9000
--#FFLAGS = -O +ppu
--#FTNLIB = -U77
--##--------------------------
--### Absoft Linux f77
--#FC = f77
--#FFLAGS = -O -f -s -W -B108 -N34
--##--------------------------
--### f2c/gcc compiler driver
--#FC = fort77
--#FFLAGS = -O2 -fomit-frame-pointer
--##--------------------------
--### GNU g77
--#FC = g77
--#FFLAGS = -O3
--##--------------------------
--### Intel Fortran Compiler 8.x
--FC = ifort
--FFLAGS = -O
--PLTLIB = -L/usr/X11R6/lib -lX11
--SECOND = second_ifc.f
--#FTNLIB = -Vaxlib
--##--------------------------
--### double-precision option (also need double precision Eispack and libPlt)
--FFLAGS = -O -r8
--PLTOBJ = ../plotlib/libPltDP.a
+diff -rupN Avl/eispack/Makefile Avl-new/eispack/Makefile
+--- Avl/eispack/Makefile 2013-10-07 01:33:49.000000000 +0200
++++ Avl-new/eispack/Makefile 2014-02-12 20:34:07.523939285 +0100
+@@ -1,22 +1,15 @@
--##---------------------------------------
--## Uncomment for Mac OSX gfortran
++EISLIB = eispack.a
FC = gfortran
-+PLTLIB = -lX11
-+PLTOBJ = ../plotlib/libPlt.a
-+# FFLAGS += -fdefault-real-8
-+# PLTOBJ = ../plotlib/libPltDP.a
-
--#ACHK = -fbounds-check
--ACHK =
--
--#FTNLIB = -Vaxlib
--FTNLIB =
-+# Subroutine SECOND source file
- SECOND = second_g77.f
-
--#DP = -fdefault-real-8
--DP =
--#PLTOBJ = ../plotlib/libPltDP.a
--PLTOBJ = ../plotlib/libPlt_gfortran.a
--
--FFLAGS = -O $(ACHK) $(DP)
- ##---------------------------------------
-
--
--
- all: $(PROGS)
-
- install: $(PROGS)
-diff -rupN avl3.32/Avl/eispack/Makefile avl3.32-new/Avl/eispack/Makefile
---- avl3.32/Avl/eispack/Makefile 2011-09-04 03:14:44.000000000 +0200
-+++ avl3.32-new/Avl/eispack/Makefile 2013-09-12 18:29:31.732356827 +0200
-@@ -1,22 +1,17 @@
--
--FC = ifort
-FLG = -O
- EISLIB = eispack.a
-AR = ar r
-RAN = ranlib
-
+-
-DP =
-+FC = gfortran
-
- #- uncomment for double-precision option
--DP = -r8
+-EISLIB = eispack_gSP.a
+-
+-#DP = -fdefault-real-8
+-#EISLIB = eispack_gDP.a
+# DP = -fdefault-real-8
- eispack.a: eispack.f
+ $(EISLIB): eispack.f
- $(FC) -c $(FLG) $(DP) eispack.f
- $(AR) $(EISLIB) eispack.o
- $(RAN) $(EISLIB)
@@ -235,10 +160,10 @@ diff -rupN avl3.32/Avl/eispack/Makefile avl3.32-new/Avl/eispack/Makefile
+ rm -f *.o *.a
-diff -rupN avl3.32/Avl/plotlib/Makefile avl3.32-new/Avl/plotlib/Makefile
---- avl3.32/Avl/plotlib/Makefile 2010-06-07 16:29:26.000000000 +0200
-+++ avl3.32-new/Avl/plotlib/Makefile 2013-09-12 18:31:08.849851424 +0200
-@@ -21,22 +21,16 @@
+diff -rupN Avl/plotlib/Makefile Avl-new/plotlib/Makefile
+--- Avl/plotlib/Makefile 2012-12-17 05:10:15.000000000 +0100
++++ Avl-new/plotlib/Makefile 2014-02-12 20:35:58.210812314 +0100
+@@ -21,23 +21,16 @@
# or drela at mit.edu
#***********************************************************************
@@ -256,19 +181,18 @@ diff -rupN avl3.32/Avl/plotlib/Makefile avl3.32-new/Avl/plotlib/Makefile
INSTALLDIR = .
-# Use these to set default library name (overridden in config.make file)
--PLTLIB = libPlt.a
--#PLTLIB = libPltDP.a
+FC = gfortran
+
-+PLTLIB = libPltDP.a
-+
+ PLTLIB = libPlt.a
+-#PLTLIB = libPltDP.a
+
+# Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
+override CFLAGS += -DUNDERSCORE
+# override FFLAGS += -fdefault-real-8
-
###========================================================
-@@ -67,16 +61,11 @@ OBJ3D = plt_3D.o
+ ### Basic plot library object files
+@@ -67,16 +60,11 @@ OBJ3D = plt_3D.o
###-------------------------------------------------------------------------
@@ -287,7 +211,7 @@ diff -rupN avl3.32/Avl/plotlib/Makefile avl3.32-new/Avl/plotlib/Makefile
test: $(PLTLIB)
(cd examples; make test)
-@@ -86,13 +75,13 @@ test: $(PLTLIB)
+@@ -86,13 +74,13 @@ test: $(PLTLIB)
### Utility functions - install the library, clean the directory
install: $(PLTLIB)
diff --git a/sources b/sources
index fee55ab..78956aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d39efde524730ed32ecf152c947afec avl3.32.tgz
+c2afea857271f1cde9c42257acbea350 avl3.35.tgz
More information about the scm-commits
mailing list