Author: qboosh Date: Sun Jan 1 13:03:46 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 2.2.3
- updated ufconfig,shared patches
---- Files affected:
packages/CAMD:
CAMD-shared.patch (1.3 -> 1.4) , CAMD-ufconfig.patch (1.1 -> 1.2) ,
CAMD.spec (1.13 -> 1.14)
---- Diffs:
================================================================
Index: packages/CAMD/CAMD-shared.patch
diff -u packages/CAMD/CAMD-shared.patch:1.3 packages/CAMD/CAMD-shared.patch:1.4
--- packages/CAMD/CAMD-shared.patch:1.3 Fri Jan 4 23:54:21 2008
+++ packages/CAMD/CAMD-shared.patch Sun Jan 1 14:03:41 2012
@@ -28,9 +28,8 @@
./camd_simple > my_camd_simple.out
- diff camd_simple.out my_camd_simple.out
-diff -ur camd/Lib/GNUmakefile camd-shared/Lib/GNUmakefile
---- camd/Lib/GNUmakefile 2007-12-02 19:00:35.000000000 +0100
-+++ camd-shared/Lib/GNUmakefile 2007-12-02 18:59:22.000000000 +0100
+--- CAMD/Lib/GNUmakefile.orig 2012-01-01 13:54:50.662901345 +0100
++++ CAMD/Lib/GNUmakefile 2012-01-01 14:04:33.546254197 +0100
@@ -2,7 +2,7 @@
# CAMD Makefile for compiling on Unix systems (for GNU make only)
#-------------------------------------------------------------------------------
@@ -45,22 +44,22 @@
camd_global.o: ../Source/camd_global.c $(INC)
- $(C) -c $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) $(CFLAGS) $(CONFIG) -I../Include
-c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -c $< -o $@
camd_i_%.o: ../Source/camd_%.c $(INC)
- $(C) -DDINT -c $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDINT $(CFLAGS) $(CONFIG)
-I../Include -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDINT -c $< -o $@
camd_l_%.o: ../Source/camd_%.c $(INC)
- $(C) -DDLONG -c $< -o $@
-+ libtool --tag=CC --mode=compile $(CC) -DDLONG $(CFLAGS) $(CONFIG)
-I../Include -c $< -o $@
++ libtool --tag=CC --mode=compile $(C) -DDLONG -c $< -o $@
#-------------------------------------------------------------------------------
# Create the libcamd.a library (C versions only)
#-------------------------------------------------------------------------------
-libcamd.a: camd_global.o $(CAMDI) $(CAMDL)
-- $(AR) libcamd.a $^
+- $(ARCHIVE) libcamd.a $^
- - $(RANLIB) libcamd.a
+libcamd.la: camd_global.o $(CAMDI) $(CAMDL)
+ libtool --tag=CC --mode=link $(CC) $(LDFLAGS) -o libcamd.la -rpath
$(libdir) $(^:.o=.lo) -lm
@@ -71,7 +70,7 @@
#-------------------------------------------------------------------------------
# Remove all but the files in the original distribution
-@@ -73,4 +71,4 @@
+@@ -55,4 +58,4 @@
purge: distclean
distclean: clean
================================================================
Index: packages/CAMD/CAMD-ufconfig.patch
diff -u packages/CAMD/CAMD-ufconfig.patch:1.1
packages/CAMD/CAMD-ufconfig.patch:1.2
--- packages/CAMD/CAMD-ufconfig.patch:1.1 Fri Dec 7 02:55:01 2007
+++ packages/CAMD/CAMD-ufconfig.patch Sun Jan 1 14:03:41 2012
@@ -10,9 +10,8 @@
int main (void)
{
-diff -ur CAMD/Demo/Makefile CAMD-uf/Demo/Makefile
---- CAMD/Demo/Makefile 2007-05-05 16:25:26.000000000 +0200
-+++ CAMD-uf/Demo/Makefile 2007-12-02 18:01:51.000000000 +0100
+--- CAMD/Demo/Makefile.orig 2011-12-08 17:12:27.000000000 +0100
++++ CAMD/Demo/Makefile 2012-01-01 13:52:29.406229949 +0100
@@ -4,13 +4,13 @@
default: camd_simple camd_demo camd_demo2 camd_l_demo
@@ -20,12 +19,12 @@
-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
-UFCONFIG = ../../UFconfig/UFconfig.h
+UFCONFIG = /usr/share/misc/UFconfig.mk
-
+
-INC = ../Include/camd.h $(UFCONFIG)
+INC = ../Include/camd.h
@@ -67,9 +66,8 @@
#if defined (DLONG) || defined (ZLONG)
-diff -ur CAMD/Lib/Makefile CAMD-uf/Lib/Makefile
---- CAMD/Lib/Makefile 2007-05-06 14:32:40.000000000 +0200
-+++ CAMD-uf/Lib/Makefile 2007-12-02 18:02:11.000000000 +0100
+--- CAMD/Lib/Makefile.orig 2011-12-08 18:36:42.000000000 +0100
++++ CAMD/Lib/Makefile 2012-01-01 13:52:49.706230628 +0100
@@ -8,9 +8,9 @@
default: everything
@@ -77,8 +75,8 @@
-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/camd_aat.c -o camd_i_aat.o
@@ -126,22 +124,22 @@
SRC = ../Source/camd_1.c ../Source/camd_2.c ../Source/camd_aat.c \
../Source/camd_control.c ../Source/camd_defaults.c ../Source/camd_dump.c \
---- CAMD/Lib/GNUmakefile~ 2007-05-06 14:32:19.000000000 +0200
-+++ CAMD/Lib/GNUmakefile 2007-12-02 18:23:35.000000000 +0100
+--- CAMD/Lib/GNUmakefile.orig 2011-12-08 18:36:27.000000000 +0100
++++ CAMD/Lib/GNUmakefile 2012-01-01 13:53:05.949564506 +0100
@@ -4,9 +4,9 @@
- default: ../Lib/libamd.a
+ default: libcamd.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 @@
- CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_post_tree
camd_defaults \
+@@ -15,9 +15,7 @@ C = $(CC) $(CF) -I../Include -I../../UFc
+ CAMD = camd_aat camd_1 camd_2 camd_dump camd_postorder camd_defaults \
camd_order camd_control camd_info camd_valid camd_preprocess
-UFCONFIG = ../../UFconfig/UFconfig.h
================================================================
Index: packages/CAMD/CAMD.spec
diff -u packages/CAMD/CAMD.spec:1.13 packages/CAMD/CAMD.spec:1.14
--- packages/CAMD/CAMD.spec:1.13 Thu Jan 27 19:45:49 2011
+++ packages/CAMD/CAMD.spec Sun Jan 1 14:03:41 2012
@@ -2,16 +2,16 @@
Summary: CAMD: Constrainted Approximate Minimum Degree
Summary(pl.UTF-8): CAMD - przybliżony ograniczony algorytm minimalnego
stopnia
Name: CAMD
-Version: 2.2.2
+Version: 2.2.3
Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://www.cise.ufl.edu/research/sparse/camd/%{name}-%{version}.tar.gz
-# Source0-md5: 540993c40f5540ce89a36fdf836becda
+# Source0-md5: 9b35e0663f96bb43d23cf3c5d8154c23
Patch0: %{name}-ufconfig.patch
Patch1: %{name}-shared.patch
URL: http://www.cise.ufl.edu/research/sparse/camd/
-BuildRequires: UFconfig
+BuildRequires: UFconfig >= 3.7.0
BuildRequires: libtool >= 2:1.5
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -29,7 +29,7 @@
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki CAMD
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: UFconfig
+Requires: UFconfig >= 3.7.0
%description devel
Header files for CAMD library.
@@ -100,6 +100,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14 2012/01/01 13:03:41 qboosh
+- updated to 2.2.3
+- updated ufconfig,shared patches
+
Revision 1.13 2011/01/27 18:45:49 qboosh
- updated to 2.2.2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CAMD/CAMD-shared.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CAMD/CAMD-ufconfig.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/CAMD/CAMD.spec?r1=1.13&r2=1.14&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
