- updated to 2.4.0

- updated ufconfig,shared patches

diff --git a/AMD.spec b/AMD.spec
index 5e53d0cd95ce74516f38e950980eb4291894209a..9c2c870bd5e7671a4a45445ed47c36d27a5a502e 100644 (file)
--- a/AMD.spec
+++ b/AMD.spec
@@ -1,18 +1,19 @@
 Summary:       AMD: Approximate Minimum Degree
 Summary(pl.UTF-8):     AMD - przybliżony algorytm minimalnego stopnia
 Name:          AMD
-Version:       2.3.1
+Version:       2.4.0
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.cise.ufl.edu/research/sparse/amd/%{name}-%{version}.tar.gz
-# Source0-md5: ee402611aa672257752611cfac10d7cd
+# Source0-md5: 5044de774a2f7804d09ac0d5134d6884
 Patch0:                amd-ufconfig.patch
 Patch1:                amd-shared.patch
 URL:           http://www.cise.ufl.edu/research/sparse/amd/
-BuildRequires: SuiteSparse_config >= 4.0.0
+BuildRequires: SuiteSparse_config >= 4.3.0
 BuildRequires: gcc-fortran
 BuildRequires: libtool >= 2:1.5
+Requires:      SuiteSparse_config-libs >= 4.3.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,7 +35,7 @@ Summary:      Header files for AMD library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki AMD
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      SuiteSparse_config >= 4.0.0
+Requires:      SuiteSparse_config >= 4.3.0
 
 %description devel
 Header files for AMD library.

diff --git a/amd-shared.patch b/amd-shared.patch
index a06d05fc9eca903450535379a964e5a3b17d2875..7bf855bf1a21e2d113ff9bc0847de74405c61823 100644 (file)
--- a/amd-shared.patch
+++ b/amd-shared.patch
@@ -1,34 +1,33 @@
-diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
---- AMD/Demo/Makefile  2007-12-02 19:00:33.000000000 +0100
-+++ AMD-shared/Demo/Makefile   2007-12-02 18:55:08.000000000 +0100
-@@ -23,22 +23,22 @@
+--- AMD/Demo/Makefile.orig     2014-10-01 18:52:11.373161939 +0200
++++ AMD/Demo/Makefile  2014-10-01 18:55:15.923154199 +0200
+@@ -26,22 +26,22 @@
  dist:
  
  amd_demo: amd_demo.c library $(INC)
--      $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB)
+-      $(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo amd_demo.c ../Lib/libamd.la $(LIB2)
        ./amd_demo > my_amd_demo.out
        - diff amd_demo.out my_amd_demo.out
  
  amd_l_demo: amd_l_demo.c library $(INC)
--      $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB)
+-      $(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_l_demo amd_l_demo.c ../Lib/libamd.la $(LIB2)
        ./amd_l_demo > my_amd_l_demo.out
        - diff amd_l_demo.out my_amd_l_demo.out
  
  amd_demo2: amd_demo2.c library $(INC)
--      $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB)
+-      $(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_demo2 amd_demo2.c ../Lib/libamd.la $(LIB2)
        ./amd_demo2 > my_amd_demo2.out
        - diff amd_demo2.out my_amd_demo2.out
  
  amd_simple: amd_simple.c library $(INC)
--      $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB)
-+      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB)
+-      $(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB2)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) $(CFLAGS) -I../Include -o amd_simple amd_simple.c ../Lib/libamd.la $(LIB2)
        ./amd_simple > my_amd_simple.out
        - diff amd_simple.out my_amd_simple.out
  
-@@ -51,23 +51,20 @@
+@@ -54,23 +54,20 @@
  cross: amd_f77cross
  
  amd_f77demo: amd_f77demo.f f77lib
@@ -57,8 +56,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   2012-01-01 12:11:28.552693675 +0100
-+++ AMD/Lib/GNUmakefile        2012-01-01 12:15:13.479367873 +0100
+--- AMD/Lib/GNUmakefile.orig   2014-10-01 18:52:11.376495274 +0200
++++ AMD/Lib/GNUmakefile        2014-10-01 18:58:19.216479852 +0200
 @@ -2,7 +2,7 @@
  # AMD Makefile for compiling on Unix systems (for GNU make only)
  #-------------------------------------------------------------------------------
@@ -68,13 +67,9 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
  
  include /usr/share/misc/SuiteSparse_config.mk
  
-@@ -29,39 +29,45 @@
+@@ -29,37 +29,43 @@
  #-------------------------------------------------------------------------------
  
- amd_global.o: ../Source/amd_global.c $(INC)
--      $(C) -c $< -o $@
-+      libtool --tag=CC --mode=compile $(C) -c $< -o $@
- 
  amd_i_%.o: ../Source/amd_%.c $(INC)
 -      $(C) -DDINT -c $< -o $@
 +      libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
@@ -87,15 +82,15 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
  # Create the libamd.a library (C versions only)
  #-------------------------------------------------------------------------------
  
--libamd.a: amd_global.o $(AMDI) $(AMDL)
+-libamd.a: $(AMDI) $(AMDL)
 -      $(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
++libamd.la: $(AMDI) $(AMDL)
++      libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libamd.la -rpath $(libdir) $(^:.o=.lo) -lsuitesparseconfig -lm
 +
 +install: libamd.la
 +      install -d $(DESTDIR)$(libdir)
-+      libtool --mode=install install libamd.la $(DESTDIR)$(libdir)/libamd.la
++      libtool --mode=install install libamd.la $(DESTDIR)$(libdir)
  
  #-------------------------------------------------------------------------------
  # compile the Fortran versions and the libamdf77.a library
@@ -119,14 +114,15 @@ diff -ur AMD/Demo/Makefile AMD-shared/Demo/Makefile
 -      - $(RANLIB) libamdf77.a
 +libamdf77.la: $(AMDF77)
 +      libtool --tag=F77 --mode=link $(F77) $(LDFLAGS) -o libamdf77.la -rpath $(libdir) $(^:.o=.lo) -lm
-+
+ 
 +install-fortran: libamdf77.la
 +      install -d $(DESTDIR)$(libdir)
-+      libtool --mode=install install libamdf77.la $(DESTDIR)$(libdir)/libamdf77.la
- 
++      libtool --mode=install install libamdf77.la $(DESTDIR)$(libdir)
++ 
  #-------------------------------------------------------------------------------
  # Remove all but the files in the original distribution
-@@ -73,4 +79,4 @@
+ #-------------------------------------------------------------------------------
+@@ -70,4 +76,4 @@
  purge: distclean
  
  distclean: clean

diff --git a/amd-ufconfig.patch b/amd-ufconfig.patch
index cc8b75c9e1cc0156c8dede9e1cc7d0fed46a44a3..373012d8d9caadf80b779b245e10b621068c6928 100644 (file)
--- a/amd-ufconfig.patch
+++ b/amd-ufconfig.patch
@@ -1,6 +1,6 @@
---- AMD/Demo/Makefile.orig     2012-05-27 01:13:34.000000000 +0200
-+++ AMD/Demo/Makefile  2012-06-27 15:15:08.539047966 +0200
-@@ -4,11 +4,11 @@
+--- AMD/Demo/Makefile.orig     2014-10-01 19:46:11.263025978 +0200
++++ AMD/Demo/Makefile  2014-10-01 19:57:46.742996793 +0200
+@@ -4,16 +4,15 @@
  
  default: amd_simple amd_demo amd_demo2 amd_l_demo
  
@@ -13,8 +13,14 @@
 -INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
 +INC = ../Include/amd.h
  
+-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
++LIB2 = -lsuitesparseconfig $(LIB)
+ 
  library:
+-      ( cd ../../SuiteSparse_config ; $(MAKE) )
        ( cd ../Lib ; $(MAKE) )
+ 
+ f77lib:
 --- AMD/Doc/Makefile.orig      2012-05-28 02:24:04.000000000 +0200
 +++ AMD/Doc/Makefile   2012-06-27 15:15:47.109046348 +0200
 @@ -4,7 +4,7 @@