rpms/e2fsprogs/devel blkid_types-wrapper.h, NONE, 1.1 ext2_types-wrapper.h, NONE, 1.1 e2fsprogs.spec, 1.78, 1.79

[Eric Sandeen (sandeen)]

Author: sandeen

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

Modified Files:
	e2fsprogs.spec 
Added Files:
	blkid_types-wrapper.h ext2_types-wrapper.h 
Log Message:
* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
- wrap a couple headers to fix multilib issues (#270441)



--- NEW FILE blkid_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because blkid_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "blkid_types-i386.h"
#elif defined(__ia64__)
#include "blkid_types-ia64.h"
#elif defined(__powerpc64__)
#include "blkid_types-ppc64.h"
#elif defined(__powerpc__)
#include "blkid_types-ppc.h"
#elif defined(__s390x__)
#include "blkid_types-s390x.h"
#elif defined(__s390__)
#include "blkid_types-s390.h"
#elif defined(__x86_64__)
#include "blkid_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



--- NEW FILE ext2_types-wrapper.h ---
/* This file is here to prevent a file conflict on multiarch systems. A
 * conflict will occur because ext2_types.h has arch-specific definitions.
 *
 * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */

#if defined(__i386__)
#include "ext2_types-i386.h"
#elif defined(__ia64__)
#include "ext2_types-ia64.h"
#elif defined(__powerpc64__)
#include "ext2_types-ppc64.h"
#elif defined(__powerpc__)
#include "ext2_types-ppc.h"
#elif defined(__s390x__)
#include "ext2_types-s390x.h"
#elif defined(__s390__)
#include "ext2_types-s390.h"
#elif defined(__x86_64__)
#include "ext2_types-x86_64.h"
#else
#error "This e2fsprogs-devel package does not work your architecture?"
#endif



Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- e2fsprogs.spec	30 Aug 2007 01:41:58 -0000	1.78
+++ e2fsprogs.spec	7 Sep 2007 20:20:43 -0000	1.79
@@ -4,12 +4,14 @@
 Summary: Utilities for managing the second and third extended (ext2/ext3) filesystems
 Name: e2fsprogs
 Version: 1.40.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 # License based on upstream-modified COPYING file,
 # which clearly states "V2" intent.
 License: GPLv2
 Group: System Environment/Base
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source1: ext2_types-wrapper.h
+Source2: blkid_types-wrapper.h
 Patch30: e2fsprogs-1.38-resize-inode.patch
 Patch32: e2fsprogs-1.38-no_pottcdate.patch
 Patch34: e2fsprogs-1.39-blkid-devmapper.patch
@@ -110,6 +112,16 @@
 export PATH=/sbin:$PATH
 make install install-libs DESTDIR="%{buildroot}" \
 	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+
+# ugly hack to allow parallel install of 32-bit and 64-bit -devel packages:
+mv -f $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types-%{_arch}.h
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/ext2fs/ext2_types.h
+
+mv -f $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h \
+      $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types-%{_arch}.h
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h
+
 %find_lang %{name}
 
 %check
@@ -248,8 +260,11 @@
 %{_mandir}/man3/uuid_unparse.3*
 
 %changelog
+* Fri Sep 07 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-5
+- wrap a couple headers to fix multilib issues (#270441)
+
 * Wed Aug 29 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-4
-- add gawk to e2fsprogs-devel Requires, compile_et needs it
+- add gawk to e2fsprogs-devel Requires, compile_et needs it (#265961)
 
 * Thu Aug 23 2007 Eric Sandeen <esandeen at redhat.com> 1.40.2-3
 - Update license tags