From f1ba000aa646835564f6c476629bf8cc180e86cbe48ab1cf888d82fad2647a73 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 2 Sep 2007 08:09:27 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmikmod?expand=0&rev=4 --- libmikmod-rpmlintrc | 16 +++++++++++ libmikmod.changes | 5 ++++ libmikmod.spec | 18 ++++++++---- mikmod-64bit-fix.diff | 64 ------------------------------------------- 4 files changed, 33 insertions(+), 70 deletions(-) create mode 100644 libmikmod-rpmlintrc delete mode 100644 mikmod-64bit-fix.diff diff --git a/libmikmod-rpmlintrc b/libmikmod-rpmlintrc new file mode 100644 index 0000000..4586e0b --- /dev/null +++ b/libmikmod-rpmlintrc @@ -0,0 +1,16 @@ +# This line is mandatory to access the configuration functions +from Config import * + +# The development of libmikmod has stopped in mid-2004, it is highly unlikely +# that there will ever be a newer version, installing this version in parallel +# an even older version sounds something which only experts would do while +# debugging, and an application build must be very old to need libmikmod < 2.0, +# so there is little priority in a rename in libmikmod due to these: +# +# W: libmikmod shlib-policy-nonversioned-dir /usr/share/doc/packages/libmikmod +# Your shared library package contains non-versioned directories. Those will not +# allow to install multiple versions of the package in parallel. +# W: libmikmod shlib-legacy-policy-name-error libmikmod2 + +addFilter("libmikmod shlib-policy-nonversioned-dir") +addFilter("libmikmod shlib-legacy-policy-name-error libmikmod2") diff --git a/libmikmod.changes b/libmikmod.changes index f9af8ca..8b4a38e 100644 --- a/libmikmod.changes +++ b/libmikmod.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 31 15:32:16 CEST 2007 - bk@suse.de + +- Remove obsoleted 64-bit patch (fixes background music of pingus) + ------------------------------------------------------------------- Wed Apr 11 16:06:26 CEST 2007 - sbrabec@suse.cz diff --git a/libmikmod.spec b/libmikmod.spec index 01c5bd2..c8a6685 100644 --- a/libmikmod.spec +++ b/libmikmod.spec @@ -13,16 +13,16 @@ Name: libmikmod BuildRequires: esound-devel URL: http://mikmod.raphnet.net/ -License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: LGPL v2 or later Group: System/Libraries Summary: MikMod Sound Library Version: 3.1.11a -Release: 1 +Release: 30 %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 +Source2: libmikmod-rpmlintrc Patch3: libmikmod-config-fix.dif Patch4: libmikmod-conftest_fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -37,12 +37,15 @@ mtm, xm, and it. %package devel -Group: System/Libraries -Summary: MikMod Sound Library +Group: Development/Libraries/C and C++ +Summary: Development files for MikMod Sound Library Requires: %{name} = %{version} glibc-devel audiofile-devel PreReq: %install_info_prereq %description devel +This package contains files needed for compiling programs using +libmikmod. + 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 @@ -55,7 +58,6 @@ mtm, xm, and it. %setup -q -n %{name}-%{_version} %patch -p1 %patch1 -%patch2 %patch3 %patch4 @@ -66,6 +68,8 @@ make %{?jobs:-j%jobs} %install %makeinstall +cmp $RPM_BUILD_ROOT%{_includedir}/mikmod{,_build}.h && +ln -f $RPM_BUILD_ROOT%{_includedir}/mikmod{,_build}.h %clean rm -rf $RPM_BUILD_ROOT @@ -98,6 +102,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man1/*-config.* %changelog +* Fri Aug 31 2007 - bk@suse.de +- Remove obsoleted 64-bit patch (fixes background music of pingus) * Wed Apr 11 2007 - sbrabec@suse.cz - Updated to version 3.1.11-a: * work correctly on amd64 diff --git a/mikmod-64bit-fix.diff b/mikmod-64bit-fix.diff deleted file mode 100644 index 77d091a..0000000 --- a/mikmod-64bit-fix.diff +++ /dev/null @@ -1,64 +0,0 @@ ---- include/mikmod.h.in -+++ include/mikmod.h.in -@@ -85,30 +85,15 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) --/* 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 */ --#if !defined(__OS2__)&&!defined(__EMX__)&&!defined(WIN32) --typedef unsigned long ULONG; /* 4 bytes, unsigned */ --typedef int BOOL; /* 0=false, <>0 true */ --#endif --#endif -+#include -+#include -+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 */ -+typedef uint32_t ULONG; /* 4 bytes, unsigned */ -+typedef bool BOOL; /* 0=false, <>0 true */ - - /* - * ========== 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 -+typedef int64_t SLONGLONG; -+#include -+#if ULONG_MAX > 0xffffffff - #define NATIVE_64BIT_INT --#elif defined(__WATCOMC__) --typedef __int64 SLONGLONG; --#elif defined(WIN32) && !defined(__MWERKS__) --typedef LONGLONG SLONGLONG; --#else --typedef long long SLONGLONG; - #endif - - /*========== Error handling */