rpms/libmikmod/devel .cvsignore, 1.2, 1.3 libmikmod-64bit.patch, 1.1, 1.2 libmikmod.spec, 1.4, 1.5 sources, 1.2, 1.3 libmikmod-3.1.11-a.diff, 1.1, NONE libmikmod-rpath.patch, 1.2, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Sat Feb 16 08:20:43 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/libmikmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4468
Modified Files:
.cvsignore libmikmod-64bit.patch libmikmod.spec sources
Removed Files:
libmikmod-3.1.11-a.diff libmikmod-rpath.patch
Log Message:
update to libmikmod-3.2.0-beta2, fix playback on 64bit arches
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 24 Oct 2007 07:52:21 -0000 1.2
+++ .cvsignore 16 Feb 2008 08:19:45 -0000 1.3
@@ -1 +1 @@
-libmikmod-3.1.11.tar.gz
+libmikmod-3.2.0-beta2.tar.bz2
libmikmod-64bit.patch:
Index: libmikmod-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/libmikmod-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmikmod-64bit.patch 24 Oct 2007 07:52:21 -0000 1.1
+++ libmikmod-64bit.patch 16 Feb 2008 08:19:45 -0000 1.2
@@ -16,7 +16,7 @@
@DOES_NOT_HAVE_SIGNED@
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
+-#if defined(__arch64__) || defined(__alpha)
+#include <stdint.h>
+#if __WORDSIZE == 64
/* 64 bit architectures */
Index: libmikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/libmikmod.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libmikmod.spec 14 Feb 2008 07:42:55 -0000 1.4
+++ libmikmod.spec 16 Feb 2008 08:19:45 -0000 1.5
@@ -1,20 +1,18 @@
Summary: A MOD music file player library
Name: libmikmod
-Version: 3.1.11
-Release: 5%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
License: GPLv2 and LGPLv2+
Group: Applications/Multimedia
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: esound-devel
URL: http://mikmod.raphnet.net/
-Source0: http://mikmod.raphnet.net/files/libmikmod-%{version}.tar.gz
-# patch has been updated to ship only fuctional stuff
-Patch0: http://mikmod.raphnet.net/files/libmikmod-%{version}-a.diff
+Source0: http://mikmod.raphnet.net/files/libmikmod-%{version}-beta2.tar.bz2
+Patch0: libmikmod-64bit.patch
Patch1: libmikmod-esd.patch
-Patch2: libmikmod-64bit.patch
-Patch3: libmikmod-strip-lib.patch
-Patch4: libmikmod-rpath.patch
-Patch5: libmikmod-multilib.patch
+Patch2: libmikmod-strip-lib.patch
+Patch3: libmikmod-multilib.patch
+Patch4: libmikmod-autoconf.patch
%description
libmikmod is a library used by the mikmod MOD music file player for
@@ -33,13 +31,12 @@
applications for mikmod.
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-%{version}-beta2
+%patch0 -p1 -b .64bit
%patch1 -p1 -b .esd
-%patch2 -p1 -b .64bit
-%patch3 -p1 -b .lib-strip
-%patch4 -p1 -b .rpath
-%patch5 -p1 -b .multilib
+%patch2 -p1 -b .strip-lib
+%patch3 -p1 -b .multilib
+%patch4 -p1 -b .autoconf
%build
%configure
@@ -81,6 +78,10 @@
%{_mandir}/man1/libmikmod-config*
%changelog
+* Fri Feb 15 2008 Jindrich Novy <jnovy at redhat.com> 3.2.0-1
+- update to libmikmod-3.2.0-beta2
+- fix playback on 64bit arches
+
* Thu Feb 14 2008 Jindrich Novy <jnovy at redhat.com> 3.1.11-5
- fix rpath patch so that there are no undefined symbols in
libmikmod.so (#431745)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmikmod/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 24 Oct 2007 07:52:21 -0000 1.2
+++ sources 16 Feb 2008 08:19:45 -0000 1.3
@@ -1 +1 @@
-705106da305e8de191549f1e7393185c libmikmod-3.1.11.tar.gz
+5b05f3b1167eba7855b8e38bde2b8070 libmikmod-3.2.0-beta2.tar.bz2
--- libmikmod-3.1.11-a.diff DELETED ---
--- libmikmod-rpath.patch DELETED ---
More information about the fedora-extras-commits
mailing list