[picosat] Rebuild for GCC 4.7. Minor spec file cleanups.

[Jerry James]

commit 9934fb724b7bd811f83e9e6358ac7e2b2ceee888
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jan 6 09:26:13 2012 -0700

    Rebuild for GCC 4.7.
    Minor spec file cleanups.

 picosat.spec |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/picosat.spec b/picosat.spec
index de8a9aa..93a88bc 100644
--- a/picosat.spec
+++ b/picosat.spec
@@ -1,6 +1,6 @@
 Name:           picosat
 Version:        936
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A SAT solver
 
 Group:          Applications/Engineering
@@ -22,7 +22,7 @@ Patch0:         picosat-trace.patch
 Patch1:         picosat-proof-access.patch
 
 # gzip required (see app.c); find-requires can't see into C code to find it
-Requires:       gzip, %{name}-libs = %{version}-%{release}
+Requires:       gzip, %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 PicoSAT solves the SAT problem, which is the classical NP complete
@@ -43,7 +43,7 @@ solvers by the same authors.
 %package devel
 Group:          Development/Libraries
 Summary:        Development files for PicoSAT
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 Headers and other development files for PicoSAT.
@@ -79,8 +79,6 @@ sed -e "s/@CC@/gcc/" \
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # Install the header file
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 cp -p picosat.h $RPM_BUILD_ROOT%{_includedir}
@@ -106,32 +104,30 @@ cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1
 
 %postun libs -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 # The LICENSE file is placed in the -libs package rather than the base package,
 # because the -libs package is always installed when the base package is
 # installed, but not vice versa.
 %files
-%defattr(-,root,root,-)
 %{_bindir}/picosat*
 %{_bindir}/picomus
 %{_mandir}/man1/picosat*
 %{_mandir}/man1/picomus*
 
 %files libs
-%defattr(-,root,root,-)
 %doc LICENSE NEWS
 %{_libdir}/libpicosat-trace.so.*
 %{_libdir}/libpicosat.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/picosat.h
 %{_libdir}/libpicosat-trace.so
 %{_libdir}/libpicosat.so
 
 %changelog
+* Fri Jan  6 2012 Jerry James <loganjerry at gmail.com> - 936-3
+- Rebuild for GCC 4.7
+- Minor spec file cleanups
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 936-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild