Description of problem: While adding new architecture to blkid_types-wrapper.h and ext2_types-wrapper.h, I propose a better multilib support to e2fsprogs. Some other packages like net-smnp has this approach. The patch is against e2fsprogs-1.40.8-2. --- e2fsprogs.spec.org 2008-05-12 13:14:11.000000000 +0900 +++ e2fsprogs.spec 2008-05-12 13:19:53.000000000 +0900 @@ -1,3 +1,6 @@ +# Arches on which we need to prevent arch conflicts on block_types.h and blkid_types.h +%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64 + %define _root_sbindir /sbin %define _root_libdir /%{_lib} @@ -108,6 +111,7 @@ make install install-libs DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \ root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir} +%ifarch %{multilib_arches} # 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 @@ -116,6 +120,7 @@ mv -f $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h \ $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types-%{_arch}.h install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/blkid/blkid_types.h +%endif # Our own initscript for uuidd install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/uuidd --- blkid_types-wrapper.h.org 2008-05-12 13:20:22.000000000 +0900 +++ blkid_types-wrapper.h 2008-05-12 13:20:38.000000000 +0900 @@ -17,10 +17,6 @@ #include "blkid_types-s390.h" #elif defined(__x86_64__) #include "blkid_types-x86_64.h" -#elif defined(__alpha__) -#include "blkid_types-alpha.h" -#elif defined(__arm__) -#include "blkid_types-arm.h" #else #error "This e2fsprogs-devel package does not work your architecture?" #endif --- ext2_types-wrapper.h.org 2008-05-12 13:20:46.000000000 +0900 +++ ext2_types-wrapper.h 2008-05-12 13:20:55.000000000 +0900 @@ -17,10 +17,6 @@ #include "ext2_types-s390.h" #elif defined(__x86_64__) #include "ext2_types-x86_64.h" -#elif defined(__alpha__) -#include "ext2_types-alpha.h" -#elif defined(__arm__) -#include "ext2_types-arm.h" #else #error "This e2fsprogs-devel package does not work your architecture?" #endif
Created attachment 305078 [details] patch file
I suppose that's a bit cleaner, so that if new arches aren't multi-arch you don't have to mess with it. You might consider adding this to the packaging wiki (somewhere...) as a better example. Thanks, -Eric
Ah, yes, I was going to add non-multilib arch (sh3,sh4). Would you add some packaging guideline about this. I've sent similar patch for gmp(Bug #437688), SDL(Bug #433618) and net-smnp(Bug #442881) before. But I didn't know what really to do. I can resend patch according to the guideline. Thanks.
Changing version to '9' as part of upcoming Fedora 9 GA. More information and reason for this action is here: http://fedoraproject.org/wiki/BugZappers/HouseKeeping
Fixed in F9 and rawhide, e2fsprogs-1.40.10-3