[factory] Revert "factory-3-1-4"

[Rex Dieter]

commit f74d81e239d5c2e11d65184b64611d74121b4702
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 25 14:31:38 2012 -0500

    Revert "factory-3-1-4"
    
    This reverts commit 8578e1eb30019a3e84dc28719619b2cb8bd3abbd.
    
    this and libfac-3.1.4 are just too busted for now.

 .gitignore    |    3 +--
 factory.spec  |   46 ++++++++++++++--------------------------------
 factoryconf.h |   24 ++++++++++++++++++++++++
 sources       |    2 +-
 4 files changed, 40 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e991283..d70c317 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/factory-3-1-1.tar.gz
-/factory-3-1-4.tar.gz
+factory-3-1-1.tar.gz
diff --git a/factory.spec b/factory.spec
index 68c76e1..5eb0dcc 100644
--- a/factory.spec
+++ b/factory.spec
@@ -1,17 +1,18 @@
 
 ## 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.4
-Release: 1%{?dist}
+Version: 3.1.1
+Release: 3%{?dist}.2
 
 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-4.tar.gz
+Source0: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/factory-3-1-1.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,7 +49,8 @@ of multivariate polynomial data.
   --with-gmp \
   %{?_with_NTL}
 
-make %{?_smp_mflags} 
+# smp bustage?
+make 
 
 
 %install
@@ -58,25 +60,10 @@ rm -rf %{buildroot}
 %makeinstall
 
 %ifarch %{multilib_arches}
-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
+# 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
 %endif
 
 
@@ -86,19 +73,14 @@ rm -rf %{buildroot}
 
 %files devel 
 %defattr(-,root,root,-)
-%doc COPYING
+# FIXME: ping upstream 
+#doc COPYING
 %doc ChangeLog NEWS README
-%{_libdir}/libcf.a
-%{_libdir}/libcfmem.a
-%{_libdir}/libsingcf_g.a
-%{_includedir}/*.h
-%{_includedir}/templates/
+%{_libdir}/lib*.a
+%{_includedir}/*
 
 
 %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/factoryconf.h b/factoryconf.h
new file mode 100644
index 0000000..73d325f
--- /dev/null
+++ b/factoryconf.h
@@ -0,0 +1,24 @@
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because apr.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#if defined(__x86_64__)
+#include "factoryconf-x86_64.h"
+#elif defined(__i386__)
+#include "factoryconf-i386.h"
+#elif defined(__powerpc64__)
+#include "factoryconf-ppc64.h"
+#elif defined(__powerpc__)
+#include "factoryconf-ppc.h"
+#elif defined(__s390x__)
+#include "factoryconf-s390x.h"
+#elif defined(__s390__)
+#include "factoryconf-s390.h"
+#elif defined(__sparc__) && defined (__arch64__)
+#include "factoryconf-sparc64.h"
+#elif defined(__sparc__)
+#include "factoryconf-sparc.h"
+#else
+#error "This factory-devel package does not work your architecture?"
+#endif
diff --git a/sources b/sources
index 10f1792..de215c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edf61fe101118eba3cc6f640ea7addf8  factory-3-1-4.tar.gz
+3e4f05a1cb6e8ccdd02bc065e50eafbc  factory-3-1-1.tar.gz