[m4ri] New upstream version. Preserve timestamps on modified header files.
Jerry James
jjames at fedoraproject.org
Thu Jul 21 15:53:55 UTC 2011
commit 53fa0304abfd41598ea9452462d4db15badcafe6
Author: Jerry James <loganjerry at gmail.com>
Date: Thu Jul 21 09:53:10 2011 -0600
New upstream version.
Preserve timestamps on modified header files.
.gitignore | 2 +-
m4ri-no-sse3.patch | 50 +++++++++++++++++++++++++-------------------------
m4ri.spec | 15 +++++++++++----
sources | 2 +-
4 files changed, 38 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ddf70e..871567f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/m4ri-20110613.tar.gz
+/m4ri-20110715.tar.gz
diff --git a/m4ri-no-sse3.patch b/m4ri-no-sse3.patch
index 928e9ba..df32c70 100644
--- a/m4ri-no-sse3.patch
+++ b/m4ri-no-sse3.patch
@@ -1,27 +1,16 @@
---- ./Makefile.am.orig 2011-06-08 11:15:10.000000000 -0600
-+++ ./Makefile.am 2011-06-09 09:52:10.775396174 -0600
+--- ./Makefile.am.orig 2011-07-11 08:18:19.000000000 -0600
++++ ./Makefile.am 2011-07-21 09:23:11.038954507 -0600
@@ -14,7 +14,7 @@
#libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20110601 -no-undefined
+ libm4ri_la_LDFLAGS = -release 0.0.20110715 -no-undefined
-libm4ri_la_LIBADD = -lm
+libm4ri_la_LIBADD = -lgomp
check_PROGRAMS=test_multiplication test_elimination test_trsm test_pls test_solve test_kernel test_random test_smallops test_transpose test_colswap
test_multiplication_SOURCES=testsuite/test_multiplication.c
---- ./configure.ac.orig 2011-06-08 11:15:10.000000000 -0600
-+++ ./configure.ac 2011-06-09 09:52:29.198396176 -0600
-@@ -17,7 +17,7 @@
- dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O.
- AM_PROG_CC_C_O
-
--AC_PROG_LIBTOOL
-+LT_INIT
-
- AC_PROG_INSTALL
-
---- ./m4/ax_ext.m4.orig 2011-06-08 11:15:10.000000000 -0600
-+++ ./m4/ax_ext.m4 2011-06-09 09:53:08.854396176 -0600
+--- ./m4/ax_ext.m4.orig 2011-07-11 08:18:19.000000000 -0600
++++ ./m4/ax_ext.m4 2011-07-21 09:23:11.038954507 -0600
@@ -65,21 +65,8 @@
fi
])
@@ -46,8 +35,8 @@
if test "$ax_cv_have_mmx_ext" = yes; then
AC_DEFINE(HAVE_MMX,,[Support mmx instructions])
---- ./m4/ax_func_posix_memalign.m4.orig 2011-06-08 11:15:10.000000000 -0600
-+++ ./m4/ax_func_posix_memalign.m4 2011-06-09 09:54:19.326396175 -0600
+--- ./m4/ax_func_posix_memalign.m4.orig 2011-07-11 08:18:19.000000000 -0600
++++ ./m4/ax_func_posix_memalign.m4 2011-07-21 09:23:11.038954507 -0600
@@ -27,18 +27,15 @@
AC_DEFUN([AX_FUNC_POSIX_MEMALIGN],
[AC_CACHE_CHECK([for working posix_memalign],
@@ -70,9 +59,20 @@
],
[ax_cv_func_posix_memalign_works=yes],
[ax_cv_func_posix_memalign_works=no],
---- ./configure.orig 2011-06-08 11:15:16.000000000 -0600
-+++ ./configure 2011-06-09 09:54:48.403396178 -0600
-@@ -11909,35 +11909,8 @@
+--- ./configure.ac.orig 2011-07-11 08:18:19.000000000 -0600
++++ ./configure.ac 2011-07-21 09:23:11.039954472 -0600
+@@ -17,7 +17,7 @@
+ dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O.
+ AM_PROG_CC_C_O
+
+-AC_PROG_LIBTOOL
++LT_INIT
+
+ AC_PROG_INSTALL
+
+--- ./configure.orig 2011-07-11 08:18:25.000000000 -0600
++++ ./configure 2011-07-21 09:23:35.012992883 -0600
+@@ -11913,35 +11913,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_sse2_ext" >&5
$as_echo "$ax_cv_have_sse2_ext" >&6; }
@@ -110,7 +110,7 @@
if test "$ax_cv_have_mmx_ext" = yes; then
-@@ -12169,11 +12142,15 @@
+@@ -12180,11 +12153,15 @@
int
main ()
{
@@ -126,12 +126,12 @@
}
_ACEOF
---- ./Makefile.in.orig 2011-06-08 11:15:17.000000000 -0600
-+++ ./Makefile.in 2011-06-09 09:54:49.330396177 -0600
+--- ./Makefile.in.orig 2011-07-11 08:18:26.000000000 -0600
++++ ./Makefile.in 2011-07-21 09:23:35.882956640 -0600
@@ -352,7 +352,7 @@
#libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20110601 -no-undefined
+ libm4ri_la_LDFLAGS = -release 0.0.20110715 -no-undefined
-libm4ri_la_LIBADD = -lm
+libm4ri_la_LIBADD = -lgomp
test_multiplication_SOURCES = testsuite/test_multiplication.c
diff --git a/m4ri.spec b/m4ri.spec
index c6cb529..c98962e 100644
--- a/m4ri.spec
+++ b/m4ri.spec
@@ -1,5 +1,5 @@
Name: m4ri
-Version: 20110613
+Version: 20110715
Release: 1%{?dist}
Summary: Linear Algebra over F_2
Group: Development/Libraries
@@ -91,9 +91,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
# Fix include references in the installed headers
cd $RPM_BUILD_ROOT%{_includedir}/m4ri
-sed -r -i 's|^(#[[:blank:]]*include[[:blank:]]+)"(.*)"|\1<m4ri/\2>|' \
- brilliantrussian.h echelonform.h m4ri.h misc.h mmc.h packedmatrix.h \
- parity.h permutation.h pls.h pls_mmpf.h solve.h strassen.h trsm.h xor.h
+for f in brilliantrussian.h echelonform.h m4ri.h misc.h mmc.h packedmatrix.h \
+ parity.h permutation.h pls.h pls_mmpf.h solve.h strassen.h trsm.h xor.h; do
+ sed -r 's|^(#[[:blank:]]*include[[:blank:]]+)"(.*)"|\1<m4ri/\2>|' $f > $f.n
+ touch -r $f $f.n
+ mv -f $f.n $f
+done
%check
@@ -125,6 +128,10 @@ make check
%changelog
+* Thu Jul 21 2011 Jerry James <loganjerry at gmail.com> - 20110715-1
+- New upstream version
+- Preserve timestamps on modified header files
+
* Fri Jun 17 2011 Jerry James <loganjerry at gmail.com> - 20110613-1
- New upstream version
- Rebase no-sse3 patch
diff --git a/sources b/sources
index 77eb88a..bc420f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21864190bde84aa4541ff7df4172d421 m4ri-20110613.tar.gz
+6cbb2a89aeb6f124006cf2b17f91e93d m4ri-20110715.tar.gz
More information about the scm-commits
mailing list