[m4ri] New upstream version. Installed headers no longer need an update.

[Jerry James]

commit 9fddbba6efc2917ff823dcf159159b36c8cbb59e
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Dec 31 13:03:18 2012 -0700

    New upstream version.
    Installed headers no longer need an update.

 .gitignore         |    2 +-
 m4ri-no-sse3.patch |    8 ++++----
 m4ri-printf.patch  |    4 ++--
 m4ri.spec          |   24 +++++++++++-------------
 sources            |    2 +-
 5 files changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3ebbd23..bc6771e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/m4ri-20120613.tar.gz
+/m4ri-20121224.tar.gz
diff --git a/m4ri-no-sse3.patch b/m4ri-no-sse3.patch
index 04693f0..a62cb35 100644
--- a/m4ri-no-sse3.patch
+++ b/m4ri-no-sse3.patch
@@ -1,6 +1,6 @@
---- configure.orig	2012-06-07 10:09:49.000000000 -0600
-+++ configure	2012-12-10 09:51:18.767358231 -0700
-@@ -12014,9 +12014,6 @@
+--- configure.orig	2012-11-11 12:49:44.000000000 -0700
++++ configure	2012-12-31 11:44:04.566112846 -0700
+@@ -12017,9 +12017,6 @@
  else
  
      ax_cv_have_sse3_ext=no
@@ -10,7 +10,7 @@
  
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_sse3_ext" >&5
-@@ -12029,9 +12026,6 @@
+@@ -12032,9 +12029,6 @@
  else
  
      ax_cv_have_ssse3_ext=no
diff --git a/m4ri-printf.patch b/m4ri-printf.patch
index eaf5790..91a3b58 100644
--- a/m4ri-printf.patch
+++ b/m4ri-printf.patch
@@ -1,5 +1,5 @@
---- src/io.c.orig	2012-06-07 10:09:37.000000000 -0600
-+++ src/io.c	2012-12-10 10:25:56.074595994 -0700
+--- ./m4ri/io.c.orig	2012-10-26 02:46:49.000000000 -0600
++++ ./m4ri/io.c	2012-12-31 11:42:55.770730088 -0700
 @@ -27,9 +27,10 @@
  
  #include "io.h"
diff --git a/m4ri.spec b/m4ri.spec
index 7fe9aa1..9a230a1 100644
--- a/m4ri.spec
+++ b/m4ri.spec
@@ -1,5 +1,5 @@
 Name:           m4ri
-Version:        20120613
+Version:        20121224
 Release:        1%{?dist}
 Summary:        Linear Algebra over F_2
 Group:          Development/Libraries
@@ -61,7 +61,9 @@ sed -e "s|\(hardcode_libdir_flag_spec=\)'.*|\1|" \
     -i configure 
 
 # Fix a couple of broken doxygen commands
-sed -i -e "s/\\\\output/\\\\return/" -e "s/\\\\seealso/\\\\see/" src/misc.h
+sed -i.orig "s/\\\\output/\\\\return/;s/\\\\seealso/\\\\see/" m4ri/misc.h
+touch -r m4ri/misc.h.orig m4ri/misc.h
+rm -f m4ri/misc.h.orig
 
 
 %build
@@ -72,10 +74,10 @@ sed -i -e "s/\\\\output/\\\\return/" -e "s/\\\\seealso/\\\\see/" src/misc.h
 sed -e 's/^#undef HAVE_MMX/#define HAVE_MMX/' \
     -e 's/^#undef HAVE_SSE$/#define HAVE_SSE/' \
     -e 's/^#undef HAVE_SSE2/#define HAVE_SSE2/' \
-    -i src/config.h
+    -i m4ri/config.h
 sed -e 's/^\(#define __M4RI_HAVE_SSE2[[:blank:]]*\)0/\11/' \
     -e 's/^\(#define __M4RI_SIMD_CFLAGS[[:blank:]]*\).*/\1" -mmmx -msse -msse2"/' \
-    -i src/m4ri_config.h
+    -i m4ri/m4ri_config.h
 sed -i 's/^SIMD_CFLAGS =.*/SIMD_CFLAGS = -mmmx -msse -msse2/' Makefile
 %else
 %configure --enable-openmp LDFLAGS="$RPM_LD_FLAGS -Wl,--as-needed"
@@ -94,7 +96,7 @@ make %{?_smp_mflags}
 %endif
 
 # Build documentation
-cd src
+cd m4ri
 doxygen
 
 
@@ -111,14 +113,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib%{name}.la
 
-# Fix include references in the installed headers
-cd $RPM_BUILD_ROOT%{_includedir}/m4ri
-for f in `grep -l '^#[[:blank:]]*include[[:blank:]]*".*"' *.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
 make check LD_LIBRARY_PATH=`pwd`/.libs
@@ -150,6 +144,10 @@ make check LD_LIBRARY_PATH=`pwd`/.libs
 
 
 %changelog
+* Mon Dec 31 2012 Jerry James <loganjerry at gmail.com> - 20121224-1
+- New upstream version
+- Installed headers no longer need an update
+
 * Mon Dec 10 2012 Jerry James <loganjerry at gmail.com> - 20120613-1
 - New upstream version
 
diff --git a/sources b/sources
index 3544fa8..330c2b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9fe6b6b30f927d7a22bc65cbc7a2b41a  m4ri-20120613.tar.gz
+1a2a59b547fed9e825ff9135a21ba53b  m4ri-20121224.tar.gz