- updated to 2.2.3

- updated ufconfig,shared patches

Changed files:
    AMD.spec -> 1.18
    amd-shared.patch -> 1.5
    amd-ufconfig.patch -> 1.2

diff --git a/AMD.spec b/AMD.spec
index c2cc37f17d64b09744624f1732a2209f3e40bcfc..1f2918c977245a33c345c1d5622b32c23a5db558 100644 (file)
--- a/AMD.spec
+++ b/AMD.spec
@@ -1,12 +1,12 @@
 Summary:       AMD: Approximate Minimum Degree
 Summary(pl.UTF-8):     AMD - przybliżony algorytm minimalnego stopnia
 Name:          AMD
-Version:       2.2.2
+Version:       2.2.3
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/amd/%{name}-%{version}.tar.gz
-# Source0-md5: 76b870aaf5c98eb34579467dfed38b19
+# Source0-md5: 4d2a7db82406f880e7686fbd2df5a3bf
 Patch0:                amd-ufconfig.patch
 Patch1:                amd-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/amd/

diff --git a/amd-shared.patch b/amd-shared.patch
index 28a72f180d636883f43d4025feeb91ccfda51854..343917ed836b5a7aecb47b2e3bb146d89e2c7d55 100644 (file)
--- a/amd-shared.patch
+++ b/amd-shared.patch
@@ -57,8 +57,8 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
        ./amd_f77cross > my_amd_f77cross.out
        - diff amd_f77cross.out my_amd_f77cross.out
  
---- AMD/Lib/GNUmakefile.orig   2010-10-13 08:48:16.000000000 +0200
-+++ AMD/Lib/GNUmakefile        2010-10-13 08:54:35.527741882 +0200
+--- AMD/Lib/GNUmakefile.orig   2012-01-01 12:11:28.552693675 +0100
++++ AMD/Lib/GNUmakefile        2012-01-01 12:15:13.479367873 +0100
 @@ -2,7 +2,7 @@
  # AMD Makefile for compiling on Unix systems (for GNU make only)
  #-------------------------------------------------------------------------------
@@ -88,7 +88,7 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
  #-------------------------------------------------------------------------------
  
 -libamd.a: amd_global.o $(AMDI) $(AMDL)
--      $(AR) libamd.a $^
+-      $(ARCHIVE) libamd.a $^
 -      - $(RANLIB) libamd.a
 +libamd.la: amd_global.o $(AMDI) $(AMDL)
 +      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lm
@@ -115,7 +115,7 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
 +      libtool --tag=F77 --mode=compile $(F77) $(F77FLAGS) -c ../Source/amdbar.f -o amdbar.o
  
 -libamdf77.a: $(AMDF77)
--      $(AR) libamdf77.a $^
+-      $(ARCHIVE) libamdf77.a $^
 -      - $(RANLIB) libamdf77.a
 +libamdf77.la: $(AMDF77)
 +      libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm

diff --git a/amd-ufconfig.patch b/amd-ufconfig.patch
index a56b7c1af05c895a60b86c57edc21535a8fce2cb..f91da3636666e45338000ee8f5cec2de4a84e25b 100644 (file)
--- a/amd-ufconfig.patch
+++ b/amd-ufconfig.patch
@@ -10,9 +10,8 @@ diff -ur AMD/Demo/amd_l_demo.c AMD-uf/Demo/amd_l_demo.c
  
  int main (void)
  {
-diff -ur AMD/Demo/Makefile AMD-uf/Demo/Makefile
---- AMD/Demo/Makefile  2007-05-05 16:25:26.000000000 +0200
-+++ AMD-uf/Demo/Makefile       2007-12-02 18:01:51.000000000 +0100
+--- AMD/Demo/Makefile.orig     2011-12-08 17:09:28.000000000 +0100
++++ AMD/Demo/Makefile  2012-01-01 12:05:32.912681767 +0100
 @@ -4,11 +4,11 @@
  
  default: amd_simple amd_demo amd_demo2 amd_l_demo
@@ -20,8 +19,8 @@ diff -ur AMD/Demo/Makefile AMD-uf/Demo/Makefile
 -include ../../UFconfig/UFconfig.mk
 +include /usr/share/misc/UFconfig.mk
  
--C = $(CC) $(CFLAGS) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../UFconfig
++C = $(CC) $(CF) -I../Include
  
 -INC = ../Include/amd.h ../../UFconfig/UFconfig.h
 +INC = ../Include/amd.h
@@ -64,9 +63,8 @@ diff -ur AMD/Include/amd_internal.h AMD-uf/Include/amd_internal.h
  
  #if defined (DLONG) || defined (ZLONG)
  
-diff -ur AMD/Lib/Makefile AMD-uf/Lib/Makefile
---- AMD/Lib/Makefile   2007-05-06 14:32:40.000000000 +0200
-+++ AMD-uf/Lib/Makefile        2007-12-02 18:02:11.000000000 +0100
+--- AMD/Lib/Makefile.orig      2011-12-08 18:36:01.000000000 +0100
++++ AMD/Lib/Makefile   2012-01-01 12:08:08.002686960 +0100
 @@ -8,9 +8,9 @@
  
  default: everything
@@ -74,8 +72,8 @@ diff -ur AMD/Lib/Makefile AMD-uf/Lib/Makefile
 -include ../../UFconfig/UFconfig.mk
 +include /usr/share/misc/UFconfig.mk
  
--C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../UFconfig
++C = $(CC) $(CF) -I../Include
  
  everything:
        $(C) -DDINT -c ../Source/amd_aat.c -o amd_i_aat.o
@@ -123,21 +121,21 @@ diff -ur AMD/MATLAB/Makefile AMD-uf/MATLAB/Makefile
  
  SRC = ../Source/amd_1.c ../Source/amd_2.c ../Source/amd_aat.c \
      ../Source/amd_control.c ../Source/amd_defaults.c ../Source/amd_dump.c \
---- AMD/Lib/GNUmakefile~       2007-05-06 14:32:19.000000000 +0200
-+++ AMD/Lib/GNUmakefile        2007-12-02 18:23:35.000000000 +0100
+--- AMD/Lib/GNUmakefile.orig   2011-12-08 18:35:33.000000000 +0100
++++ AMD/Lib/GNUmakefile        2012-01-01 12:07:45.906019555 +0100
 @@ -4,9 +4,9 @@
  
- default: ../Lib/libamd.a
+ default: libamd.a
  
 -include ../../UFconfig/UFconfig.mk
 +include /usr/share/misc/UFconfig.mk
  
--C = $(CC) $(CFLAGS) $(CONFIG) -I../Include -I../../UFconfig
-+C = $(CC) $(CFLAGS) $(CONFIG) -I../Include
+-C = $(CC) $(CF) -I../Include -I../../UFconfig
++C = $(CC) $(CF) -I../Include
  
  #-------------------------------------------------------------------------------
  # source files
-@@ -15,9 +15,7 @@
+@@ -15,9 +15,7 @@ C = $(CC) $(CF) -I../Include -I../../UFc
  AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
        amd_order amd_control amd_info amd_valid amd_preprocess