- fixed multilib devel conflicts (#192665)
This commit is contained in:
Thomas Woerner 2006-07-24 14:54:10 +00:00
parent 3a2fbf331d
commit 48973b7e6d
2 changed files with 92 additions and 1 deletions

View File

@ -0,0 +1,85 @@
--- e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in.multilib 2006-04-09 03:39:39.000000000 +0200
+++ e2fsprogs-1.39/lib/ext2fs/ext2_types.h.in 2006-07-24 16:14:11.000000000 +0200
@@ -9,6 +9,17 @@
@ASM_TYPES_HEADER@
+# define SIZEOF_SHORT 2
+# define SIZEOF_INT 4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG 8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG 4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
#ifdef __U8_TYPEDEF
typedef __U8_TYPEDEF __u8;
#else
--- e2fsprogs-1.39/lib/blkid/blkid_types.h.in.multilib 2006-04-09 03:43:44.000000000 +0200
+++ e2fsprogs-1.39/lib/blkid/blkid_types.h.in 2006-07-24 16:14:56.000000000 +0200
@@ -9,6 +9,17 @@
@ASM_TYPES_HEADER@
+# define SIZEOF_SHORT 2
+# define SIZEOF_INT 4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG 8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG 4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
#ifdef __U8_TYPEDEF
typedef __U8_TYPEDEF __u8;
#else
--- e2fsprogs-1.39/lib/uuid/uuid_types.h.in.multilib 2006-07-24 16:08:53.000000000 +0200
+++ e2fsprogs-1.39/lib/uuid/uuid_types.h.in 2006-07-24 16:10:46.000000000 +0200
@@ -9,6 +9,17 @@
typedef unsigned char uint8_t;
typedef signed char int8_t;
+# define SIZEOF_SHORT 2
+# define SIZEOF_INT 4
+#if __WORDSIZE == 64
+# define SIZEOF_LONG 8
+#elif __WORDSIZE == 32
+# define SIZEOF_LONG 4
+#else
+# error unknown __WORDSIZE
+#endif
+# define SIZEOF_LONG_LONG 8
+
#if (@SIZEOF_INT@ == 8)
typedef int int64_t;
typedef unsigned int uint64_t;
--- e2fsprogs-1.39/configure.in.multilib 2006-07-24 16:06:33.000000000 +0200
+++ e2fsprogs-1.39/configure.in 2006-07-24 16:07:46.000000000 +0200
@@ -611,14 +611,14 @@
ac_cv_sizeof_long_long=8
AC_MSG_WARN([Cross-compiling, so cannot check type sizes; assuming short=2, int=4, long=4, long long=8])
fi
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-AC_CHECK_SIZEOF(long long)
-SIZEOF_SHORT=$ac_cv_sizeof_short
-SIZEOF_INT=$ac_cv_sizeof_int
-SIZEOF_LONG=$ac_cv_sizeof_long
-SIZEOF_LONG_LONG=$ac_cv_sizeof_long_long
+dnl AC_CHECK_SIZEOF(short)
+dnl AC_CHECK_SIZEOF(int)
+dnl AC_CHECK_SIZEOF(long)
+dnl AC_CHECK_SIZEOF(long long)
+SIZEOF_SHORT="SIZEOF_SHORT"
+SIZEOF_INT="SIZEOF_INT"
+SIZEOF_LONG="SIZEOF_LONG"
+SIZEOF_LONG_LONG="SIZEOF_LONG_LONG"
AC_SUBST(SIZEOF_SHORT)
AC_SUBST(SIZEOF_INT)
AC_SUBST(SIZEOF_LONG)

View File

@ -4,7 +4,7 @@
Summary: Utilities for managing the second extended (ext2) filesystem. Summary: Utilities for managing the second extended (ext2) filesystem.
Name: e2fsprogs Name: e2fsprogs
Version: 1.39 Version: 1.39
Release: 3 Release: 4
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@ -15,6 +15,7 @@ Patch34: e2fsprogs-1.39-blkid-devmapper.patch
Patch36: e2fsprogs-1.38-etcblkid.patch Patch36: e2fsprogs-1.38-etcblkid.patch
Patch37: e2fsprogs-1.39-blkid-gfs.patch Patch37: e2fsprogs-1.39-blkid-gfs.patch
Patch38: e2fsprogs-1.39-blkid-devname.patch Patch38: e2fsprogs-1.39-blkid-devname.patch
Patch39: e2fsprogs-1.39-multilib.patch
Url: http://e2fsprogs.sourceforge.net/ Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper
@ -74,6 +75,8 @@ also want to install e2fsprogs.
%patch37 -p1 -b .gfs %patch37 -p1 -b .gfs
# Fix device mapper names in blkid # Fix device mapper names in blkid
%patch38 -p1 -b .devname %patch38 -p1 -b .devname
# Fix multilib conflicts
%patch39 -p1 -b .multilib
%build %build
aclocal aclocal
@ -225,6 +228,9 @@ exit 0
%{_mandir}/man3/uuid_unparse.3* %{_mandir}/man3/uuid_unparse.3*
%changelog %changelog
* Mon Jul 24 2006 Thomas Woerner <twoerner@redhat.com> - 1.39-4
- fixed multilib devel conflicts (#192665)
* Thu Jul 20 2006 Bill Nottingham <notting@redhat.com> - 1.39-3 * Thu Jul 20 2006 Bill Nottingham <notting@redhat.com> - 1.39-3
- prevent libblkid returning /dev/dm-X - prevent libblkid returning /dev/dm-X