Author: juran Update of /cvs/free/rpms/libmad/F-10 In directory se02.es.rpmfusion.net:/tmp/cvs-serv28649 Modified Files: libmad.spec Added Files: libmad-0.15.1b-multiarch.patch Log Message: - fix multiarch (Bz 264) libmad-0.15.1b-multiarch.patch: --- NEW FILE libmad-0.15.1b-multiarch.patch --- diff -up libmad-0.15.1b/Makefile.am.orig libmad-0.15.1b/Makefile.am --- libmad-0.15.1b/Makefile.am.orig 2009-01-25 14:35:56.000000000 +0200 +++ libmad-0.15.1b/Makefile.am 2009-01-25 18:35:07.000000000 +0200 @@ -110,15 +110,28 @@ mad.h: config.status config.h Makefile.a echo "# ifdef __cplusplus"; \ echo 'extern "C" {'; \ echo "# endif"; echo; \ - if [ ".$(FPM)" != "." ]; then \ - echo ".$(FPM)" | sed -e 's|^\.-D|# define |'; echo; \ - fi; \ + echo "# ifdef __i386__"; \ + echo "# define FPM_INTEL"; \ + echo "# define SIZEOF_LONG 4"; \ + echo "# endif"; \ + echo "#ifdef __x86_64__";\ + echo "# define FPM_64BIT"; \ + echo "# define SIZEOF_LONG 8"; \ + echo "# endif"; \ + echo "#ifdef __powerpc__"; \ + echo "#define FPM_PPC"; \ + echo "#define LIZEOF_LONG 4"; \ + echo "#endif"; \ + echo "#ifdef __powerpc64__"; \ + echo "#define FPM_PPC"; \ + echo "#define LIZEOF_LONG 8"; \ + echo "#endif"; echo; \ sed -ne 's/^# *define *\(HAVE_.*_ASM\).*/# define \1/p' \ config.h; echo; \ sed -ne 's/^# *define *OPT_\(SPEED\|ACCURACY\).*/# define OPT_\1/p' \ config.h; echo; \ - sed -ne 's/^# *define *\(SIZEOF_.*\)/# define \1/p' \ - config.h; echo; \ + echo "# define SIZEOF_INT 4"; \ + echo "# define SIZEOF_LONG_LONG 8"; echo; \ for header in $(exported_headers); do \ echo; \ sed -n -f $(srcdir)/mad.h.sed $(srcdir)/$$header; \ Index: libmad.spec =================================================================== RCS file: /cvs/free/rpms/libmad/F-10/libmad.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmad.spec 30 Jul 2008 05:14:46 -0000 1.2 +++ libmad.spec 26 Jan 2009 19:39:25 -0000 1.3 @@ -1,14 +1,20 @@ Name: libmad Version: 0.15.1b -Release: 8%{?dist} +Release: 9%{?dist} Summary: MPEG audio decoder library Group: System Environment/Libraries License: GPLv2 URL: http://www.underbit.com/products/mad/ Source0: http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz +Patch0: libmad-0.15.1b-multiarch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool + + %description MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1 and the MPEG-2 extension to Lower Sampling Frequencies, as well as the @@ -27,8 +33,9 @@ %prep %setup -q +%patch0 -p1 -b .multiarch sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier -touch -r aclocal.m4 configure.ac +touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog # Create an additional pkgconfig file %{__cat} << EOF > mad.pc @@ -48,7 +55,7 @@ %build - +autoreconf -sfi %configure \ %ifarch x86_64 ia64 --enable-fpm=64bit \ @@ -90,6 +97,9 @@ %changelog +* Sun Jan 25 2009 David Juran <david(a)juran.se&gt; - 0.15.1b-9 +- fix multiarch (Bz 264) + * Wed Jul 30 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.15.1b-8 - rebuild for buildsys cflags issue