rpms/cdrtools/FC-5 cdrtools-2.01-xconfig.patch, 1.1, 1.2 cdrtools.spec, 1.43, 1.44
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 2 12:26:13 UTC 2006
Author: harald
Update of /cvs/dist/rpms/cdrtools/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20463
Modified Files:
cdrtools-2.01-xconfig.patch cdrtools.spec
Log Message:
- corrected multilib patch (bug #193796)
cdrtools-2.01-xconfig.patch:
xconfig.h.in | 68 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 24 deletions(-)
Index: cdrtools-2.01-xconfig.patch
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools-2.01-xconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cdrtools-2.01-xconfig.patch 31 May 2006 08:07:55 -0000 1.1
+++ cdrtools-2.01-xconfig.patch 2 Jun 2006 12:26:11 -0000 1.2
@@ -1,15 +1,19 @@
--- cdrtools-2.01.01/conf/xconfig.h.in.xc 2006-02-07 17:23:13.000000000 +0100
-+++ cdrtools-2.01.01/conf/xconfig.h.in 2006-05-16 13:06:50.000000000 +0200
-@@ -5,6 +5,8 @@
- * Copyright (c) 1998-2003 J. Schilling
++++ cdrtools-2.01.01/conf/xconfig.h.in 2006-06-02 11:19:00.000000000 +0200
+@@ -418,28 +418,48 @@
+ * Byteorder/Bitorder
*/
+ #define HAVE_C_BIGENDIAN /* Flag that WORDS_BIGENDIAN test was done */
+-#undef WORDS_BIGENDIAN /* If using network byte order */
++#if defined(__BIG_ENDIAN__)
++#define WORDS_BIGENDIAN 1 /* If using network byte order */
++#endif
+ #define HAVE_C_BITFIELDS /* Flag that BITFIELDS_HTOL test was done */
+-#undef BITFIELDS_HTOL /* If high bits come first in structures */
++#if defined(__BIG_ENDIAN__)
++#define BITFIELDS_HTOL 1 /* If high bits come first in structures */
++#endif
-+#include <sys/types.h>
-+
- /*
- * Header Files
- */
-@@ -425,20 +427,20 @@
/*
* Types/Keywords
*/
@@ -25,25 +29,43 @@
-#undef SIZEOF_UNSIGNED_LONG_INT
-#undef SIZEOF_UNSIGNED_LONG_LONG
-#undef SIZEOF_UNSIGNED_CHAR_P
+
+-#undef HAVE_LONGLONG /* Compiler defines long long type */
+-#undef CHAR_IS_UNSIGNED /* Compiler defines char to be unsigned */
++#if defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__)
++#define SIZEOF_LONG_INT 8
++#define SIZEOF_CHAR_P 8
++#define SIZEOF_UNSIGNED_LONG_INT 8
++#define SIZEOF_UNSIGNED_CHAR_P 8
++#elif defined(__i386__) || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_LONG_INT 4
++#define SIZEOF_CHAR_P 4
++#define SIZEOF_UNSIGNED_LONG_INT 4
++#define SIZEOF_UNSIGNED_CHAR_P 4
++#else
++#error Architecture not defined here!
++#endif
++
+#define SIZEOF_CHAR 1
+#define SIZEOF_SHORT_INT 2
+#define SIZEOF_INT 4
-+#define SIZEOF_LONG_INT (__WORDSIZE/8)
+#define SIZEOF_LONG_LONG 8
-+#define SIZEOF_CHAR_P (__WORDSIZE/8)
+#define SIZEOF_UNSIGNED_CHAR 1
+#define SIZEOF_UNSIGNED_SHORT_INT 2
+#define SIZEOF_UNSIGNED_INT 4
-+#define SIZEOF_UNSIGNED_LONG_INT (__WORDSIZE/8)
+#define SIZEOF_UNSIGNED_LONG_LONG 8
-+#define SIZEOF_UNSIGNED_CHAR_P (__WORDSIZE/8)
-
--#undef HAVE_LONGLONG /* Compiler defines long long type */
-+#define HAVE_LONGLONG __GLIBC_HAVE_LONG_LONG /* Compiler defines long long type */
- #undef CHAR_IS_UNSIGNED /* Compiler defines char to be unsigned */
++
++#if defined(__LONG_LONG_MAX__)
++#define HAVE_LONGLONG 1 /* Compiler defines long long type */
++#endif
++
++#if defined(__CHAR_UNSIGNED__)
++#define CHAR_IS_UNSIGNED 1 /* Compiler defines char to be unsigned */
++#endif
#undef const /* Define to empty if const doesn't work */
-@@ -479,7 +481,7 @@
+ #undef uid_t /* To be used if uid_t is not present */
+@@ -479,7 +499,7 @@
/*#undef HAVE_SIZE_T*/
/*#undef NO_SIZE_T*/
@@ -52,16 +74,18 @@
#undef GETGROUPS_T
#define GID_T GETGROUPS_T
-@@ -498,7 +500,7 @@
+@@ -498,8 +518,8 @@
#ifdef HAVE_LARGEFILES /* If we have working largefiles at all */
/* This is not defined with glibc-2.1.3 */
-#undef _FILE_OFFSET_BITS /* # of bits in off_t if settable */
-+/*#undef _FILE_OFFSET_BITS*/ /* # of bits in off_t if settable */
- #undef _LARGEFILE_SOURCE /* To make ftello() visible (HP-UX 10.20). */
+-#undef _LARGEFILE_SOURCE /* To make ftello() visible (HP-UX 10.20). */
++#define _FILE_OFFSET_BITS 64 /* # of bits in off_t if settable */
++#define _LARGEFILE_SOURCE /* To make ftello() visible (HP-UX 10.20). */
#undef _LARGE_FILES /* Large file defined on AIX-style hosts. */
#undef _XOPEN_SOURCE /* To make ftello() visible (glibc 2.1.3). */
-@@ -586,11 +588,11 @@
+ /* XXX We don't use this because glibc2.1.3*/
+@@ -586,11 +606,11 @@
/*
* Strings that help to maintain OS/platform id's in C-programs
*/
Index: cdrtools.spec
===================================================================
RCS file: /cvs/dist/rpms/cdrtools/FC-5/cdrtools.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cdrtools.spec 31 May 2006 08:07:55 -0000 1.43
+++ cdrtools.spec 2 Jun 2006 12:26:11 -0000 1.44
@@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities.
Name: cdrtools
Version: 2.01.01.0.a09
-Release: 0.FC5.1
+Release: 0.FC5.2
%define tarversion 2.01.01a09
License: CDDL
Group: Applications/System
@@ -240,6 +240,9 @@
%{_mandir}/man1/cdda2wav.1*
%changelog
+* Fri Jun 02 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.2
+- corrected multilib patch (bug #193796)
+
* Wed May 31 2006 Harald Hoyer <harald at redhat.com> 8:2.01.01.0.a09-0.FC5.1
- version 2.01.01a09 for FC5
More information about the fedora-cvs-commits
mailing list