Hello community, here is the log from the commit of package libmikmod checked in at Fri Mar 23 21:22:06 CET 2007. -------- --- libmikmod/libmikmod.changes 2006-01-26 15:51:26.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmikmod/libmikmod.changes 2007-03-23 11:37:23.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 23 11:31:56 CET 2007 - schwab@suse.de + +- Require audiofile-devel. +- Fix 64bit patch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmikmod.spec ++++++ --- /var/tmp/diff_new_pack.J17861/_old 2007-03-23 21:21:23.000000000 +0100 +++ /var/tmp/diff_new_pack.J17861/_new 2007-03-23 21:21:23.000000000 +0100 @@ -1,11 +1,11 @@ # # spec file for package libmikmod (Version 3.1.11) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild @@ -13,16 +13,17 @@ Name: libmikmod BuildRequires: esound-devel URL: http://mikmod.raphnet.net/ -License: LGPL +License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: System/Libraries Obsoletes: libmikmo Provides: libmikmo PreReq: %install_info_prereq Autoreqprov: on +Requires: audiofile-devel Summary: MikMod Sound Library BuildRoot: %{_tmppath}/%{name}-%{version}-build Version: 3.1.11 -Release: 2 +Release: 41 Source0: libmikmod-%{version}.tar.bz2 Patch0: libmikmod.diff Patch1: mikmod-64bit-fix.diff @@ -48,7 +49,6 @@ %patch4 %build -libtoolize -f autoreconf -f -i export CFLAGS="%optflags" %configure @@ -78,7 +78,10 @@ /%{_libdir}/libmikmod.* %{_datadir}/aclocal/libmikmod.m4 -%changelog -n libmikmod +%changelog +* Fri Mar 23 2007 - schwab@suse.de +- Require audiofile-devel. +- Fix 64bit patch. * Thu Jan 26 2006 - sbrabec@suse.cz - Added %%install_info_prereq. * Wed Jan 25 2006 - mls@suse.de ++++++ mikmod-64bit-fix.diff ++++++ --- /var/tmp/diff_new_pack.J17861/_old 2007-03-23 21:21:24.000000000 +0100 +++ /var/tmp/diff_new_pack.J17861/_new 2007-03-23 21:21:24.000000000 +0100 @@ -1,24 +1,62 @@ ---- include/mikmod.h.in-dist 2002-08-20 16:40:45.000000000 +0200 -+++ include/mikmod.h.in 2002-08-20 16:50:34.000000000 +0200 -@@ -85,7 +85,8 @@ +--- include/mikmod.h.in ++++ include/mikmod.h.in +@@ -85,30 +85,16 @@ @DOES_NOT_HAVE_SIGNED@ -#if defined(__arch64__) || defined(__alpha) +-/* 64 bit architectures */ +- +-typedef signed char SBYTE; /* 1 byte, signed */ +-typedef unsigned char UBYTE; /* 1 byte, unsigned */ +-typedef signed short SWORD; /* 2 bytes, signed */ +-typedef unsigned short UWORD; /* 2 bytes, unsigned */ +-typedef signed int SLONG; /* 4 bytes, signed */ +-typedef unsigned int ULONG; /* 4 bytes, unsigned */ +-typedef int BOOL; /* 0=false, <>0 true */ +- +-#else +-/* 32 bit architectures */ +- +-typedef signed char SBYTE; /* 1 byte, signed */ +-typedef unsigned char UBYTE; /* 1 byte, unsigned */ +-typedef signed short SWORD; /* 2 bytes, signed */ +-typedef unsigned short UWORD; /* 2 bytes, unsigned */ +-typedef signed long SLONG; /* 4 bytes, signed */ +#include <stdint.h> -+#if __WORDSIZE == 64 - /* 64 bit architectures */ ++typedef int8_t SBYTE; /* 1 byte, signed */ ++typedef uint8_t UBYTE; /* 1 byte, unsigned */ ++typedef int16_t SWORD; /* 2 bytes, signed */ ++typedef uint16_t UWORD; /* 2 bytes, unsigned */ ++typedef int32_t SLONG; /* 4 bytes, signed */ + #if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32) +-typedef unsigned long ULONG; /* 4 bytes, unsigned */ ++typedef uint32_t ULONG; /* 4 bytes, unsigned */ + typedef int BOOL; /* 0=false, <>0 true */ + #endif +-#endif - typedef signed char SBYTE; /* 1 byte, signed */ ---- include/mikmod_internals.h-dist 2002-08-20 16:41:51.000000000 +0200 -+++ include/mikmod_internals.h 2002-08-20 16:50:59.000000000 +0200 -@@ -50,7 +50,8 @@ + /* + * ========== Error codes +--- include/mikmod_internals.h ++++ include/mikmod_internals.h +@@ -50,15 +50,11 @@ /*========== More type definitions */ /* SLONGLONG: 64bit, signed */ -#if defined (__arch64__) || defined(__alpha) +-typedef long SLONGLONG; +#include <stdint.h> -+#if __WORDSIZE == 64 - typedef long SLONGLONG; ++typedef int64_t SLONGLONG; ++#include <limits.h> ++#if ULONG_MAX > 0xffffffff #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) +-#elif defined(__WATCOMC__) +-typedef __int64 SLONGLONG; +-#elif defined(WIN32) && !defined(__MWERKS__) +-typedef LONGLONG SLONGLONG; +-#else +-typedef long long SLONGLONG; + #endif + + /*========== Error handling */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org