[minisat2] Rebuild for GCC 4.7. Use the canonical source URL. Drop the use of -ffloat-store, since the code set

[Jerry James]

commit e226356ade905409d47cf44c4a15e5087308e3f6
Author: Jerry James <loganjerry at gmail.com>
Date:   Mon Jan 9 13:40:31 2012 -0700

    Rebuild for GCC 4.7.
    Use the canonical source URL.
    Drop the use of -ffloat-store, since the code sets the FPU mode.

 .gitignore    |    2 +-
 minisat2.spec |   15 ++++++++++-----
 sources       |    2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca1d8ce..0a9f8e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/niklasso-minisat-releases-2.2.0-0-geb01ad6.tar.gz
+/minisat-2.2.0.tar.gz
diff --git a/minisat2.spec b/minisat2.spec
index 9190334..f997252 100644
--- a/minisat2.spec
+++ b/minisat2.spec
@@ -2,13 +2,13 @@
 
 Name:           minisat2
 Version:        2.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Minimalistic SAT solver
 
 License:        MIT
 Group:          Applications/Engineering
 URL:            http://minisat.se/
-Source0:        https://github.com/niklasso/minisat/tarball/releases/2.2.0/niklasso-minisat-releases-%{version}-0-geb01ad6.tar.gz
+Source0:        http://minisat.se/downloads/%{myname}-%{version}.tar.gz
 # Sent sources, test, patches (below) to upstream via email on 2008-07-08:
 Source1:        http://www.dwheeler.com/essays/minisat-user-guide-1.0.html
 Source2:        minisat2-test.in
@@ -34,7 +34,7 @@ is NP-complete, SAT solvers (like this one) are often able to decide
 this problem in a reasonable time frame.
 
 %prep
-%setup -q -n niklasso-minisat-eb01ad6
+%setup -q -n minisat
 %patch0
 
 cp -p %{SOURCE1} minisat-user-guide.html
@@ -47,8 +47,8 @@ sed -i 's/@$(CXX)/$(CXX)/' mtl/template.mk
 # Build "simp", which adds simplification capabilities, instead of just "core"
 make %{?_smp_mflags} -C simp r \
   MROOT=`pwd` \
-  COPTIMIZE="$RPM_OPT_FLAGS -ffloat-store" \
-  LFLAGS="$RPM_OPT_FLAGS -ffloat-store -lz"
+  COPTIMIZE="$RPM_OPT_FLAGS" \
+  LFLAGS="$RPM_LD_FLAGS -lz"
 cp -p simp/%{myname}_release %{myname}
 
 %install
@@ -81,6 +81,11 @@ fi
 %attr(755,root,root) %{_bindir}/%{myname}
 
 %changelog
+* Mon Jan  9 2012 Jerry James <loganjerry at gmail.com> - 2.2.0-2
+- Rebuild for GCC 4.7
+- Use the canonical source URL
+- Drop the use of -ffloat-store, since the code sets the FPU mode
+
 * Wed Jun 22 2011 Jerry James <loganjerry at gmail.com> - 2.2.0-1
 - New upstream version
 - Drop upstreamed template patch
diff --git a/sources b/sources
index 74b544d..06765ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2274977506042714811968afca01b68d  niklasso-minisat-releases-2.2.0-0-geb01ad6.tar.gz
+99a2eaabe528cd366100e4bc0327d22e  minisat-2.2.0.tar.gz