[factory] 3.1.1-4

[Rex Dieter]

commit c3f3627ac1949e0338b34cecd0b61570a1a3d3d6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jul 2 13:42:03 2012 -0500

    3.1.1-4
    
    - better multilib handling
    - %doc COPYING
    - re-enable smp build

 factory.spec  |   44 ++++++++++++++++++++++++++++++++------------
 factoryconf.h |   24 ------------------------
 2 files changed, 32 insertions(+), 36 deletions(-)
---
diff --git a/factory.spec b/factory.spec
index 5eb0dcc..181026b 100644
--- a/factory.spec
+++ b/factory.spec
@@ -1,6 +1,5 @@
 
 ## build options
-# experimental, off, for now -- Rex
 %define _with_NTL --with-NTL
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
@@ -8,7 +7,7 @@
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 3.1.1
-Release: 3%{?dist}.2
+Release: 4%{?dist}
 
 License: GPLv2 or GPLv3
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -49,8 +48,7 @@ of multivariate polynomial data.
   --with-gmp \
   %{?_with_NTL}
 
-# smp bustage?
-make 
+make %{?_smp_mflags} 
 
 
 %install
@@ -60,10 +58,25 @@ rm -rf %{buildroot}
 %makeinstall
 
 %ifarch %{multilib_arches}
-# hack to allow parallel installation of multilib factory-devel
-mv  %{buildroot}%{_includedir}/factoryconf.h \
-    %{buildroot}%{_includedir}/factoryconf-%{_arch}.h
-install -p -m644 %{SOURCE1} %{buildroot}%{_includedir}/factoryconf.h
+mv %{buildroot}%{_includedir}/factoryconf.h \
+   %{buildroot}%{_includedir}/factoryconf-%{__isa_bits}.h
+
+cat > %{buildroot}%{_includedir}/factoryconf.h <<EOF
+#ifndef FACTORYCONF_MULTILIB 
+#define FACTORYCONF_MULTILIB 
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "factoryconf-32.h"
+#elif __WORDSIZE == 64
+# include "factoryconf-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
 %endif
 
 
@@ -73,14 +86,21 @@ rm -rf %{buildroot}
 
 %files devel 
 %defattr(-,root,root,-)
-# FIXME: ping upstream 
-#doc COPYING
+%doc COPYING
 %doc ChangeLog NEWS README
-%{_libdir}/lib*.a
-%{_includedir}/*
+%{_libdir}/libcf.a
+%{_libdir}/libcfmem.a
+%{_libdir}/libsingcf_g.a
+%{_includedir}/*.h
+%{_includedir}/templates/
 
 
 %changelog
+* Mon Jul 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 3.1.1-4
+- better multilib handling
+- %%doc COPYING
+- re-enable smp build
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-3.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild