rpms/udunits/F-7 udunits-wrapper.inc, NONE, 1.1 udunits.spec, 1.10, 1.11

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/udunits/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18834/F-7

Modified Files:
	udunits.spec 
Added Files:
	udunits-wrapper.inc 
Log Message:

fix .inc header to work in multilib conditions



--- NEW FILE udunits-wrapper.inc ---
#if defined(__i386__)
#include "udunits-i386.inc"
#elif defined(__ia64__)
#include "udunits-ia64.inc"
#elif defined(__powerpc64__)
#include "udunits-ppc64.inc"
#elif defined(__powerpc__)
#include "udunits-ppc.inc"
#elif defined(__s390x__)
#include "udunits-s390x.inc"
#elif defined(__s390__)
#include "udunits-s390.inc"
#elif defined(__sparc__) && defined(__arch64__)
#include "udunits-sparc64.inc"
#elif defined(__sparc__)
#include "udunits-sparc.inc"
#elif defined(__x86_64__)
#include "udunits-x86_64.inc"
#else
#error "This udunits-devel package does not know about your architecture."
#endif



Index: udunits.spec
===================================================================
RCS file: /cvs/extras/rpms/udunits/F-7/udunits.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- udunits.spec	6 Aug 2007 19:07:02 -0000	1.10
+++ udunits.spec	29 Oct 2007 20:59:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name: udunits
 Version: 1.12.4
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
@@ -8,10 +8,12 @@
 # Upstream actually packages it as a .tar.Z, I repackaged to prevent ncompress 
 # as a dependency.
 Source0: udunits-1.12.4.tar.bz2
+Source1: udunits-wrapper.inc
 Patch0: udunits-1.12.4-linuxfixes.patch
 Patch1: udunits-1.12.4-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gcc-gfortran, gcc-c++, groff
+BuildRequires: perl(ExtUtils::MakeMaker)
 
 %description
 The Unidata units utility, udunits, supports conversion of unit specifications 
@@ -54,7 +56,7 @@
 %setup -q
 %patch0 -p1
 # Yes, this is a dirty hack.
-%ifarch x86_64 ppc64 sparc64
+%ifarch x86_64 ppc64 sparc64 ia64
 %patch1 -p1
 %endif
 
@@ -74,6 +76,26 @@
 cp -p COPYRIGHT README RELEASE_NOTES VERSION ../
 rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f
 
+# Handle multilib
+# Rename udunits.inc to udunits-<arch>.inc to avoid file conflicts on multilib systems and install wrapper include file
+# udunits-wrapper.inc as udunits.inc
+%ifarch %{ix86} x86_64 ia64 sparc sparcv9 sparc64 s390 s390x ppc ppc64
+basearch=%{_arch}
+# always use i386 for iX86
+%ifarch %{ix86}
+basearch=i386
+%endif
+%ifarch sparcv9
+basearch=sparc
+%endif
+%ifarch sparc64
+basearch=sparc64
+%endif
+# Rename files and install wrappers
+mv $RPM_BUILD_ROOT%{_includedir}/udunits.inc $RPM_BUILD_ROOT%{_includedir}/udunits-${basearch}.inc
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/udunits.inc
+%endif
+
 find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \;
 
 %clean
@@ -89,7 +111,7 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/udunits.h
-%{_includedir}/udunits.inc
+%{_includedir}/udunits*.inc
 %{_libdir}/libudport.a
 %{_libdir}/libudunits.a
 %{_mandir}/man3/udunits.3.gz
@@ -105,6 +127,18 @@
 %{_mandir}/man1/udunitsperl.1.gz
 
 %changelog
+* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-12
+- multilib enable
+
+* Wed Oct 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-11.3
+- add BR: perl(ExtUtils::MakeMaker)
+
+* Mon Aug 27 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-11.2
+- rebuild for BuildID
+
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-11.1
+- fix license (MIT)
+
 * Fri Sep 15 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.12.4-11
 - bump for FC-6