[m4ri] New upstream version. Add libpng-devel BR.

Mon Jan 30 18:39:55 UTC 2012

commit e8c63e3bd38120a2a581f5afb7239b2c623b589d
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Jan 30 11:39:42 2012 -0700

    New upstream version.
    Add libpng-devel BR.

 .gitignore         |    2 +-
 m4ri-no-sse3.patch |   59 ++++++++++++++++++++++++++++++----------------------
 m4ri.spec          |   10 ++++++--
 sources            |    2 +-
 4 files changed, 43 insertions(+), 30 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 861a9fd..55d5002 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/m4ri-20111004.tar.gz
+/m4ri-20111203.tar.gz
diff --git a/m4ri-no-sse3.patch b/m4ri-no-sse3.patch
index 11e376e..3f544eb 100644
--- a/m4ri-no-sse3.patch
+++ b/m4ri-no-sse3.patch
@@ -1,16 +1,16 @@
---- ./Makefile.am.orig	2011-10-04 04:44:26.000000000 -0600
-+++ ./Makefile.am	2011-10-10 11:26:42.184200763 -0600
-@@ -17,7 +17,7 @@ pkgconfig_DATA = m4ri.pc
+--- ./Makefile.am.orig	2011-12-03 06:44:39.000000000 -0700
++++ ./Makefile.am	2012-01-30 10:52:19.111546653 -0700
+@@ -48,7 +48,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = m4ri.pc
  
- #libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20111004 -no-undefined
--libm4ri_la_LIBADD = -lm
-+libm4ri_la_LIBADD = -lgomp
+ libm4ri_la_LDFLAGS = -release 0.0.20111203 -no-undefined
+-libm4ri_la_LIBADD = -lm $(LIBPNG_LIBADD)
++libm4ri_la_LIBADD = -lgomp $(LIBPNG_LIBADD)
  
  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
---- ./m4/ax_ext.m4.orig	2011-10-04 04:44:26.000000000 -0600
-+++ ./m4/ax_ext.m4	2011-10-10 11:27:32.240152635 -0600
+--- ./m4/ax_ext.m4.orig	2011-12-03 06:44:39.000000000 -0700
++++ ./m4/ax_ext.m4	2012-01-30 10:53:06.122461152 -0700
 @@ -65,21 +65,8 @@ AC_DEFUN([AX_EXT],
      fi
    ])
@@ -35,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-10-04 04:44:26.000000000 -0600
-+++ ./m4/ax_func_posix_memalign.m4	2011-10-10 11:28:15.792109593 -0600
+--- ./m4/ax_func_posix_memalign.m4.orig	2011-12-03 06:44:39.000000000 -0700
++++ ./m4/ax_func_posix_memalign.m4	2012-01-30 10:54:14.184123698 -0700
 @@ -27,18 +27,15 @@
  AC_DEFUN([AX_FUNC_POSIX_MEMALIGN],
  [AC_CACHE_CHECK([for working posix_memalign],
@@ -59,8 +59,8 @@
      ],
      [ax_cv_func_posix_memalign_works=yes],
      [ax_cv_func_posix_memalign_works=no],
---- ./configure.ac.orig	2011-10-04 04:44:26.000000000 -0600
-+++ ./configure.ac	2011-10-10 11:28:32.672092626 -0600
+--- ./configure.ac.orig	2011-12-03 06:44:39.000000000 -0700
++++ ./configure.ac	2012-01-30 10:55:36.084483796 -0700
 @@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
  dnl Compiling with per-target flags (test_elimination.c) requires AM_PROG_CC_C_O.
  AM_PROG_CC_C_O
@@ -70,9 +70,18 @@
  
  AC_PROG_INSTALL
  
---- ./configure.orig	2011-10-04 04:44:33.000000000 -0600
-+++ ./configure	2011-10-10 11:28:53.815090706 -0600
-@@ -11913,35 +11913,8 @@ fi
+@@ -200,7 +200,7 @@ fi
+ 
+ have_libpng="no"
+ AC_ARG_ENABLE([png],
+-   [AC_HELP_STRING([--disable-png], [disable PNG support @<:@default=enabled@:>@])],
++   [AS_HELP_STRING([--disable-png], [disable PNG support @<:@default=enabled@:>@])],
+    [
+     if test "x${enableval}" = "xyes" ; then
+        want_png="yes"
+--- ./configure.orig	2011-12-03 06:44:46.000000000 -0700
++++ ./configure	2012-01-30 10:55:45.431125717 -0700
+@@ -11987,35 +11987,8 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_sse2_ext" >&5
  $as_echo "$ax_cv_have_sse2_ext" >&6; }
  
@@ -110,7 +119,7 @@
  
    if test "$ax_cv_have_mmx_ext" = yes; then
  
-@@ -12181,11 +12154,15 @@ else
+@@ -12255,11 +12228,15 @@ else
  int
  main ()
  {
@@ -126,14 +135,14 @@
  }
  
  _ACEOF
---- ./Makefile.in.orig	2011-10-04 04:44:34.000000000 -0600
-+++ ./Makefile.in	2011-10-10 11:28:54.758092014 -0600
-@@ -357,7 +357,7 @@ pkgconfig_DATA = m4ri.pc
- 
- #libm4ri_la_LDFLAGS = -version-info 0:0:0
- libm4ri_la_LDFLAGS = -release 0.0.20111004 -no-undefined
--libm4ri_la_LIBADD = -lm
-+libm4ri_la_LIBADD = -lgomp
+--- ./Makefile.in.orig	2011-12-03 06:44:47.000000000 -0700
++++ ./Makefile.in	2012-01-30 10:55:46.293184922 -0700
+@@ -395,7 +395,7 @@ nodist_pkgincludesub_HEADERS = src/m4ri_
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = m4ri.pc
+ libm4ri_la_LDFLAGS = -release 0.0.20111203 -no-undefined
+-libm4ri_la_LIBADD = -lm $(LIBPNG_LIBADD)
++libm4ri_la_LIBADD = -lgomp $(LIBPNG_LIBADD)
  test_multiplication_SOURCES = testsuite/test_multiplication.c
  test_multiplication_LDFLAGS = -lm4ri -lm
  test_multiplication_CFLAGS = -I$(srcdir)/src $(AM_CFLAGS)
diff --git a/m4ri.spec b/m4ri.spec
index ed1f4be..e9aaf85 100644
--- a/m4ri.spec
+++ b/m4ri.spec
@@ -1,6 +1,6 @@
 Name:           m4ri
-Version:        20111004
-Release:        2%{?dist}
+Version:        20111203
+Release:        1%{?dist}
 Summary:        Linear Algebra over F_2
 Group:          Development/Libraries
 License:        GPLv2+
@@ -12,7 +12,7 @@ Source0:        http://m4ri.sagemath.org/downloads/%{name}-%{version}.tar.gz
 Patch0:         m4ri-no-sse3.patch
 
 BuildRequires:  doxygen
-BuildRequires:  dvipng
+BuildRequires:  libpng-devel
 BuildRequires:  tex(latex)
 
 
@@ -138,6 +138,10 @@ make check
 
 
 %changelog
+* Mon Jan 30 2012 Jerry James <loganjerry at gmail.com> - 20111203-1
+- New upstream version
+- Add libpng-devel BR
+
 * Fri Jan  6 2012 Jerry James <loganjerry at gmail.com> - 20111004-2
 - Rebuild for GCC 4.7
 
diff --git a/sources b/sources
index 83ee43b..c774203 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44bdb0b2eed5c24bea05ebeec252b7c3  m4ri-20111004.tar.gz
+7be27d366adebb221165233978da753a  m4ri-20111203.tar.gz
