rpms/factory/devel factoryconf.h,NONE,1.1 factory.spec,1.22,1.23

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/factory/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25646

Modified Files:
	factory.spec 
Added Files:
	factoryconf.h 
Log Message:
* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-3
- multiarch conflicts (#341091)



--- NEW FILE factoryconf.h ---
/* 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(__sparc64__)
#include "factoryconf-sparc64.h"
#elif defined(__sparc__)
#include "factoryconf-sparc.h"
#else
#error "This factory-devel package does not work your architecture?"
#endif


Index: factory.spec
===================================================================
RCS file: /cvs/pkgs/rpms/factory/devel/factory.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- factory.spec	8 Feb 2008 21:28:37 -0000	1.22
+++ factory.spec	3 Apr 2008 13:52:05 -0000	1.23
@@ -3,10 +3,12 @@
 # experimental, off, for now -- Rex
 #define _with_NTL --with-NTL
 
+%define multilib_arches i386 x86_64 ppc ppc64 s390 s390x sparc sparc64
+
 Summary: C++ class library for multivariate polynomial data
 Name:    factory
 Version: 3.0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 URL:	 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Factory/
@@ -14,6 +16,8 @@
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source1: factoryconf.h
+
 # -debuginfo useless for (only) static libs
 %define debug_package   %{nil}
 
@@ -57,6 +61,13 @@
 # FAILS: make install DESTDIR=%{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
+%endif
+
 
 %clean
 rm -rf %{buildroot} 
@@ -72,6 +83,9 @@
 
 
 %changelog
+* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-3
+- multiarch conflicts (#341091)
+
 * Fri Feb 08 2008 Rex Dieter <rdieter at fedoraproject.org> 3.0.3-2 
 - respin (gcc43)