Hello community, here is the log from the commit of package libmikmod checked in at Thu Apr 12 18:00:01 CEST 2007. -------- --- libmikmod/libmikmod.changes 2007-03-23 11:37:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmikmod/libmikmod.changes 2007-04-11 16:07:45.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Apr 11 16:06:26 CEST 2007 - sbrabec@suse.cz + +- Updated to version 3.1.11-a: + * work correctly on amd64 + * fixes a warning issued by automake-1.8 in libmikmod.m4 + * includes an updated version of config.guess and config.sub +- Split devel subpackage (#263232). + +------------------------------------------------------------------- Old: ---- libmikmod-m4-fix.dif New: ---- libmikmod-3.1.11-a.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmikmod.spec ++++++ --- /var/tmp/diff_new_pack.W20290/_old 2007-04-12 17:59:50.000000000 +0200 +++ /var/tmp/diff_new_pack.W20290/_new 2007-04-12 17:59:50.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libmikmod (Version 3.1.11) +# spec file for package libmikmod (Version 3.1.11a) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,21 +15,17 @@ URL: http://mikmod.raphnet.net/ 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: 41 -Source0: libmikmod-%{version}.tar.bz2 -Patch0: libmikmod.diff -Patch1: mikmod-64bit-fix.diff -Patch2: libmikmod-m4-fix.dif +Version: 3.1.11a +Release: 1 +%define _version 3.1.11 +Source: %{name}-%{_version}.tar.bz2 +Patch: libmikmod-3.1.11-a.diff +Patch1: libmikmod.diff +Patch2: mikmod-64bit-fix.diff Patch3: libmikmod-config-fix.dif Patch4: libmikmod-conftest_fix.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Libmikmod is a portable sound library, capable of playing samples as @@ -40,9 +36,24 @@ +%package devel +Group: System/Libraries +Summary: MikMod Sound Library +Requires: %{name} = %{version} glibc-devel audiofile-devel +PreReq: %install_info_prereq + +%description devel +Libmikmod is a portable sound library, capable of playing samples as +well as module files. It was originally written by Jean-Paul Mikkers +(MikMak) for DOS. It supports OSS /dev/dsp, ALSA, and Esound and can +also write wav files. Supported file formats include mod, stm, s3m, +mtm, xm, and it. + + + %prep -%setup -%patch +%setup -q -n %{name}-%{_version} +%patch -p1 %patch1 %patch2 %patch3 @@ -50,35 +61,49 @@ %build autoreconf -f -i -export CFLAGS="%optflags" %configure - -make +make %{?jobs:-j%jobs} %install -make DESTDIR=%buildroot install +%makeinstall + +%clean +rm -rf $RPM_BUILD_ROOT %post %run_ldconfig -%install_info --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz %postun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz +%run_ldconfig -%clean -rm -rf %buildroot +%post devel +%install_info --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz + +%postun devel +%install_info_delete --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz %files %defattr(-,root,root) %doc README AUTHORS COPYING.LIB NEWS TODO COPYING.LESSER -%{_bindir}/* +%{_libdir}/libmikmod.so.* + +%files devel +%defattr(-,root,root) +%{_bindir}/*-config +%{_datadir}/aclocal/libmikmod.m4 %{_includedir}/* -%doc %{_mandir}/man1/* %doc %{_infodir}/mikmod* -/%{_libdir}/libmikmod.* -%{_datadir}/aclocal/libmikmod.m4 +%{_libdir}/libmikmod.so +%{_libdir}/libmikmod.*a +%doc %{_mandir}/man1/*-config.* %changelog +* Wed Apr 11 2007 - sbrabec@suse.cz +- Updated to version 3.1.11-a: + * work correctly on amd64 + * fixes a warning issued by automake-1.8 in libmikmod.m4 + * includes an updated version of config.guess and config.sub +- Split devel subpackage (#263232). * Fri Mar 23 2007 - schwab@suse.de - Require audiofile-devel. - Fix 64bit patch. ++++++ libmikmod-3.1.11-a.diff ++++++ ++++ 1852 lines (skipped) ++++++ mikmod-64bit-fix.diff ++++++ --- /var/tmp/diff_new_pack.W20290/_old 2007-04-12 17:59:51.000000000 +0200 +++ /var/tmp/diff_new_pack.W20290/_new 2007-04-12 17:59:51.000000000 +0200 @@ -1,10 +1,10 @@ --- include/mikmod.h.in +++ include/mikmod.h.in -@@ -85,30 +85,16 @@ +@@ -85,30 +85,15 @@ @DOES_NOT_HAVE_SIGNED@ --#if defined(__arch64__) || defined(__alpha) +-#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -/* 64 bit architectures */ - -typedef signed char SBYTE; /* 1 byte, signed */ @@ -23,18 +23,20 @@ -typedef signed short SWORD; /* 2 bytes, signed */ -typedef unsigned short UWORD; /* 2 bytes, unsigned */ -typedef signed long SLONG; /* 4 bytes, signed */ +-#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32) +-typedef unsigned long ULONG; /* 4 bytes, unsigned */ +-typedef int BOOL; /* 0=false, <>0 true */ +-#endif +-#endif +#include <stdint.h> ++#include <stdbool.h> +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 bool BOOL; /* 0=false, <>0 true */ /* * ========== Error codes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org