rpms/chmlib/FC-6 chmlib-chm_lib-fix_for_multiarch.diff, NONE, 1.1 chmlib.spec, 1.13, 1.14 chmlib-chm_lib_c-ppc-patch.diff, 1.2, NONE

[Peter Lemenkov (peter)]

Author: peter

Update of /cvs/extras/rpms/chmlib/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32703/FC-6

Modified Files:
	chmlib.spec 
Added Files:
	chmlib-chm_lib-fix_for_multiarch.diff 
Removed Files:
	chmlib-chm_lib_c-ppc-patch.diff 
Log Message:
Better fix for multi-arch. Changed license header according to the Fedora's policy

chmlib-chm_lib-fix_for_multiarch.diff:

--- NEW FILE chmlib-chm_lib-fix_for_multiarch.diff ---
--- src/chm_lib.c	2007-08-05 09:03:27.000000000 +0400
+++ src/chm_lib.c	2007-08-05 09:07:04.000000000 +0400
@@ -148,35 +148,15 @@
 typedef unsigned __int32        UInt32;
 typedef __int64                 Int64;
 typedef unsigned __int64        UInt64;
-
-/* I386, 32-bit, non-Windows */
-/* Sparc        */
-/* MIPS         */
-/* PPC          */
-#elif __i386__ || __sun || __sgi || __ppc__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef long                    Int32;
-typedef unsigned long           UInt32;
-typedef long long               Int64;
-typedef unsigned long long      UInt64;
-
-/* x86-64 */
-/* Note that these may be appropriate for other 64-bit machines. */
-#elif __x86_64__ || __ia64__
-typedef unsigned char           UChar;
-typedef short                   Int16;
-typedef unsigned short          UInt16;
-typedef int                     Int32;
-typedef unsigned int            UInt32;
-typedef long                    Int64;
-typedef unsigned long           UInt64;
-
 #else
-
-/* yielding an error is preferable to yielding incorrect behavior */
-#error "Please define the sized types for your platform in chm_lib.c"
+#include <stdint.h>
+typedef uint8_t UChar;
+typedef int16_t Int16;
+typedef uint16_t UInt16;
+typedef int32_t Int32;
+typedef uint32_t UInt32;
+typedef int64_t Int64;
+typedef uint64_t UInt64;
 #endif
 
 /* GCC */


Index: chmlib.spec
===================================================================
RCS file: /cvs/extras/rpms/chmlib/FC-6/chmlib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chmlib.spec	4 Aug 2007 19:03:07 -0000	1.13
+++ chmlib.spec	30 Sep 2007 18:00:42 -0000	1.14
@@ -1,13 +1,12 @@
 Name: 		chmlib
 Summary: 	Library for dealing with ITSS/CHM format files
 Version: 	0.39
-Release: 	3%{?dist}
-License: 	LGPL
+Release: 	5%{?dist}
+License: 	LGPLv2+
 Group: 		Development/Libraries
 Url: 		http://www.jedrea.com/chmlib/
 Source: 	http://www.jedrea.com/chmlib/%{name}-%{version}.tar.bz2
-Patch0:		chmlib-chm_lib_c-ppc-patch.diff
-Patch1:		chmlib-0.39-axp.patch
+Patch0:		chmlib-chm_lib-fix_for_multiarch.diff
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,7 +27,6 @@
 %prep
 %setup -q 
 %patch0 -p0
-%patch1 -p1 -b .axp
 
 %build
 %configure --disable-static
@@ -58,6 +56,12 @@
 
 %changelog
 
+* Sun Sep 30 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-5
+- Changel license tag from LGPL to LGPLv2+
+
+* Sun Aug  5 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-4
+- Better fix for multi-arch issues
+
 * Sat Aug  4 2007 Peter Lemenkov <lemenkov at gmail.com> 0.39-3
 - Upstream URL changed
 


--- chmlib-chm_lib_c-ppc-patch.diff DELETED ---