rpms/zziplib/devel zziplib-0.13.49-multilib.patch, NONE, 1.1 zziplib.spec, 1.13, 1.14

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/zziplib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7596

Modified Files:
	zziplib.spec 
Added Files:
	zziplib-0.13.49-multilib.patch 
Log Message:
Patch _config.h to make it identical for 32bit and 64bit archs (#343521).


zziplib-0.13.49-multilib.patch:

--- NEW FILE zziplib-0.13.49-multilib.patch ---
diff -Naupr zziplib-0.13.49.orig/zzip/_config.h zziplib-0.13.49/zzip/_config.h
--- zziplib-0.13.49.orig/zzip/_config.h	2007-03-18 12:59:51.000000000 +0100
+++ zziplib-0.13.49/zzip/_config.h	2008-12-22 10:02:32.351372027 +0100
@@ -130,9 +130,11 @@
 
 /* whether the system defaults to 32bit off_t but can do 64bit when requested
    */
+#if __WORDSIZE == 32
 #ifndef ZZIP_LARGEFILE_SENSITIVE 
 #define ZZIP_LARGEFILE_SENSITIVE  1 
 #endif
+#endif
 
 /* Name of package */
 #ifndef ZZIP_PACKAGE 
@@ -171,7 +173,11 @@
 
 /* The number of bytes in type long */
 #ifndef ZZIP_SIZEOF_LONG 
+#if __WORDSIZE == 32
 #define ZZIP_SIZEOF_LONG  4 
+#elif __WORDSIZE == 64
+#define ZZIP_SIZEOF_LONG  8 
+#endif
 #endif
 
 /* The number of bytes in type short */
@@ -194,9 +200,11 @@
 /* #undef WORDS_BIGENDIAN */
 
 /* Number of bits in a file offset, on hosts where this is settable. */
+#if __WORDSIZE == 32
 #ifndef ZZIP__FILE_OFFSET_BITS 
 #define ZZIP__FILE_OFFSET_BITS  64 
 #endif
+#endif
 
 /* Define for large files, on AIX-style hosts. */
 /* #undef _LARGE_FILES */


Index: zziplib.spec
===================================================================
RCS file: /cvs/extras/rpms/zziplib/devel/zziplib.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- zziplib.spec	20 Feb 2008 04:55:51 -0000	1.13
+++ zziplib.spec	22 Dec 2008 09:24:20 -0000	1.14
@@ -1,12 +1,13 @@
 Summary: Lightweight library to easily extract data from zip files
 Name: zziplib
 Version: 0.13.49
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+ or MPLv1.1
 Group: Applications/Archiving
 URL: http://zziplib.sourceforge.net/
 Source: http://dl.sf.net/zziplib/zziplib-%{version}.tar.bz2
 Patch0: zziplib-0.13.49-open.patch
+Patch1: zziplib-0.13.49-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: zlib-devel, zip, python, SDL-devel, xmlto, pkgconfig
 BuildRequires: autoconf, automake
@@ -53,6 +54,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+# Save the common patched _config.h file to overwrite the generated one
+%{__cp} -a zzip/_config.h _config.h
 
 
 %build
@@ -70,6 +74,9 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
+# Overwrite the platform specific _config.h with our own modified common one
+%{__rm} -f %{buildroot}%{_includedir}/zzip/_config.h
+%{__install} -p -m 0644 _config.h %{buildroot}%{_includedir}/zzip/_config.h
 
 
 %clean
@@ -103,7 +110,10 @@
 
 
 %changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.13.49-5
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 0.13.49-6
+- Patch _config.h to make it identical for 32bit and 64bit archs (#343521).
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org>
 - Autorebuild for GCC 4.3
 
 * Wed Aug  8 2007 Matthias Saou <http://freshrpms.net/> 0.13.49-4