commit 77688b506f0e1b0a1d7b619d0021aeeeff4d98ef
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Jul 29 14:11:13 2012 +0200
- up to 20110801 and avoid defining common macros in f2c.h
libf2c-nomacros.patch | 20 ++++++++++++++++++++
libf2c.spec | 14 ++++++++------
2 files changed, 28 insertions(+), 6 deletions(-)
---
diff --git a/libf2c-nomacros.patch b/libf2c-nomacros.patch
new file mode 100644
index 0000000..6f3582e
--- /dev/null
+++ b/libf2c-nomacros.patch
@@ -0,0 +1,20 @@
+diff -urN 1.org/f2c.h0 1/f2c.h0
+--- 1.org/f2c.h0 1999-09-07 19:46:24.000000000 +0200
++++ 1/f2c.h0 2012-07-29 14:10:11.654966145 +0200
+@@ -154,16 +154,6 @@
+ };
+ typedef struct Namelist Namelist;
+
+-#define abs(x) ((x) >= 0 ? (x) : -(x))
+-#define dabs(x) (doublereal)abs(x)
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
+-#define dmin(a,b) (doublereal)min(a,b)
+-#define dmax(a,b) (doublereal)max(a,b)
+-#define bit_test(a,b) ((a) >> (b) & 1)
+-#define bit_clear(a,b) ((a) & ~((uinteger)1 << (b)))
+-#define bit_set(a,b) ((a) | ((uinteger)1 << (b)))
+-
+ /* procedure parameter types for -A and -C++ */
+
+ #define F2C_proc_par_types 1
diff --git a/libf2c.spec b/libf2c.spec
index 0a9a8f2..db132d1 100644
--- a/libf2c.spec
+++ b/libf2c.spec
@@ -1,15 +1,16 @@
Summary: Fortran to C conversion support library
Summary(pl.UTF-8): Biblioteka wspierająca tłumaczenie z Fortranu na C
Name: libf2c
-Version: 20051005
-Release: 2
+Version: 20110801
+Release: 1
License: distributable
Group: Libraries
-Source0: ftp://ftp.netlib.org/f2c/libf2c.zip
-# Source0-md5: b9ee5e6e0a2aabd2e9f3df718ecdfbec
+Source0: http://www.netlib.org/f2c/libf2c.zip
+# Source0-md5: dc6ae2b9b33347feb8bdcc3c3def8b9f
Patch0: %{name}-LP64.patch
Patch1: %{name}-opt.patch
-URL: ftp://ftp.netlib.org/f2c/
+Patch2: %{name}-nomacros.patch
+URL: http://www.netlib.org/f2c/
BuildRequires: unzip
Conflicts: f2c < 20031027-2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -46,9 +47,10 @@ Static f2c library.
Statyczna biblioteka f2c.
%prep
-%setup -q -n libf2c
+%setup -q -c
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__make} -f makefile.u \
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
