[factory] factory-3-1-4

[Rex Dieter]

commit 8578e1eb30019a3e84dc28719619b2cb8bd3abbd
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 25 12:37:49 2012 -0500

    factory-3-1-4

 .gitignore    |    3 ++-
 factory.spec  |   46 ++++++++++++++++++++++++++++++++--------------
 factoryconf.h |   24 ------------------------
 sources       |    2 +-
 4 files changed, 35 insertions(+), 40 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d70c317..e991283 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-factory-3-1-1.tar.gz
+/factory-3-1-1.tar.gz
+/factory-3-1-4.tar.gz
diff --git a/factory.spec b/factory.spec
index 5eb0dcc..68c76e1 100644
--- a/factory.spec
+++ b/factory.spec
@@ -1,18 +1,17 @@
 
 ## build options
-# experimental, off, for now -- Rex
 %define _with_NTL --with-NTL
 
 %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64
 
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
-Version: 3.1.1
-Release: 3%{?dist}.2
+Version: 3.1.4
+Release: 1%{?dist}
 
 License: GPLv2 or GPLv3
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
-Source0: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/factory-3-1-1.tar.gz
+Source0: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/factory-3-1-4.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -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.h-%{__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,19 @@ 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 Jun 25 2012 Rex Dieter <rdieter at fedoraproject.org> 3.1.4-1
+- factory-3-1-4
+
 * 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
 
diff --git a/sources b/sources
index de215c4..10f1792 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e4f05a1cb6e8ccdd02bc065e50eafbc  factory-3-1-1.tar.gz
+edf61fe101118eba3cc6f640ea7addf8  factory-3-1-4.tar.gz