[mona] Rebuild for GCC 4.7. Spec file cleanups.

[Jerry James]

commit 9af0e1a6c4b254b15667866b25a32539e369ec4b
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jan 6 10:43:17 2012 -0700

    Rebuild for GCC 4.7.
    Spec file cleanups.

 mona.spec |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/mona.spec b/mona.spec
index 8fa8f99..ae13f7f 100644
--- a/mona.spec
+++ b/mona.spec
@@ -3,7 +3,7 @@
 
 Name:           mona
 Version:        %{upver}r%{uprel}
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A decision procedure for the WS1S and WS2S logics
 
 Group:          Applications/Engineering
@@ -13,6 +13,7 @@ Source0:        http://www.brics.dk/~amoeller/mona/download/mona-%{upver}-%{upre
 Source1:        http://www.brics.dk/mona/mona14.pdf
 
 BuildRequires:  emacs, emacs-el, xemacs, xemacs-devel
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 MONA is a tool that translates formulas in the logics WS1S or WS2S into
@@ -32,7 +33,7 @@ Supporting libraries for Mona.
 %package devel
 Group:          Applications/Engineering
 Summary:        Header files for developing applications with Mona
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 Header files for developing applications that use the Mona libraries.
@@ -41,6 +42,7 @@ Header files for developing applications that use the Mona libraries.
 Group:          Applications/Engineering
 Summary:        Example Mona source files and C programs
 Requires:       %{name}-libs = %{version}-%{release}
+BuildArch:      noarch
 
 %description examples
 Example Mona source files, for use with the mona executable, and also sample C
@@ -51,6 +53,7 @@ Group:          Applications/Engineering
 Summary:        Emacs mode for editing Mona files
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       emacs(bin) >= %{_emacs_version}
+BuildArch:      noarch
 
 %description emacs
 Emacs mode for editing Mona files.
@@ -59,6 +62,7 @@ Emacs mode for editing Mona files.
 Group:          Applications/Engineering
 Summary:        Source for Emacs mode for editing Mona files
 Requires:       %{name}-emacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description emacs-el
 Source Elisp code for Emacs mode for editing Mona files.
@@ -68,6 +72,7 @@ Group:          Applications/Engineering
 Summary:        XEmacs mode for editing Mona files
 Requires:       %{name}-libs = %{version}-%{release}
 Requires:       xemacs(bin) >= %{_xemacs_version}
+BuildArch:      noarch
 
 %description xemacs
 XEmacs mode for editing Mona files.
@@ -76,6 +81,7 @@ XEmacs mode for editing Mona files.
 Group:          Applications/Engineering
 Summary:        Source for XEmacs mode for editing Mona files
 Requires:       %{name}-xemacs = %{version}-%{release}
+BuildArch:      noarch
 
 %description xemacs-el
 Source Elisp code for XEmacs mode for editing Mona files.
@@ -89,7 +95,6 @@ cp -p %{SOURCE1} .
 make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" CXXFLAGS="${RPM_OPT_FLAGS}"
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # Get rid of the .la files; we don't want them
@@ -113,15 +118,11 @@ cd $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp
 mv $RPM_BUILD_ROOT%{_datadir}/mona-mode.el .
 %_xemacs_bytecompile mona-mode.el
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc mona14.pdf
 %{_bindir}/mona
 %{_bindir}/dfa2dot
@@ -129,12 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/mona
 %{_libdir}/*.so
 
 %files examples
-%defattr(-,root,root,-)
 %doc Examples/*.mona Examples/bdd_volatility
 %{_bindir}/bdd_example
 %{_bindir}/gta_example
@@ -142,29 +141,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/presburger_transduction
 
 %files libs
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_libdir}/*.so.*
 
 %files emacs
-%defattr(-,root,root,-)
 %dir %{_emacs_sitelispdir}/mona
 %{_emacs_sitelispdir}/mona/mona-mode.elc
 
 %files emacs-el
-%defattr(-,root,root,-)
 %{_emacs_sitelispdir}/mona/mona-mode.el
 
 %files xemacs
-%defattr(-,root,root,-)
 %dir %{_xemacs_sitelispdir}
 %{_xemacs_sitelispdir}/mona-mode.elc
 
 %files xemacs-el
-%defattr(-,root,root,-)
 %{_xemacs_sitelispdir}/mona-mode.el
 
 %changelog
+* Fri Jan  6 2012 Jerry James <loganjerry at gmail.com> - 1.4r13-5
+- Rebuild for GCC 4.7
+- Spec file cleanups
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4r13-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild