Attachment 305078 Details for Bug 446016 – patch file

[patch] patch file

patch.diff (text/plain), 1.90 KB, created by CHIKAMA Masaki on 2008-05-12 04:46:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: CHIKAMA Masaki

Created: 2008-05-12 04:46:18 UTC

Size: 1.90 KB

patch

obsolete

>--- 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

Actions: View | Diff

Attachments on bug 446016: 305078