diff -r 4f133201e207 -r 4667f24fe848 libmad/libmad.spec
--- a/libmad/libmad.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/libmad/libmad.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,43 +1,41 @@
-Name:		libmad
-Version:	0.15.1b
-Release:	14%{?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
-Patch1:		libmad-0.15.1b-ppc.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-
-BuildRequires:	automake
-BuildRequires:	autoconf
-BuildRequires:	libtool
-
+Name:           libmad
+Summary:        MPEG audio decoder library
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Version:        0.15.1b
+Release:        20101201
+Group:          System Environment/Libraries
+License:        GPLv2
+URL:            http://www.underbit.com/products/mad/
+Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-MAD is a high-quality MPEG audio decoder. It currently supports MPEG-1
+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
 so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
 and Layer III a.k.a. MP3) are fully implemented.
 
-%package        devel
-Summary:	MPEG audio decoder library development files
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
+%package devel
+Summary:   MPEG audio decoder library development files
+Vendor:    Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+Requires:  pkgconfig
 
-%description	devel
-%{summary}.
-
+%description devel
+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
+so-called MPEG 2.5 format. All three audio layers (Layer I, Layer II,
+and Layer III a.k.a. MP3) are fully implemented. This package contains
+the header and library files needed to develop with %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .multiarch
-%patch1 -p1 -b .ppc
-
-sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
+sed -i -e /-fforce-mem/d configure*
 touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog
 
 # Create an additional pkgconfig file
@@ -55,37 +53,27 @@
 Cflags: -I%{_includedir}
 EOF
 
-
-
 %build
-autoreconf -sfi
 %configure \
 %ifarch x86_64 ia64 ppc64
-	--enable-fpm=64bit \
+    --enable-fpm=64bit \
 %endif
-	--disable-dependency-tracking \
-	--enable-accuracy \
-	--disable-debugging \
-	--disable-static    
-
-make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
+    --enable-accuracy \
+    --disable-debugging
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__install} -D -p -m 0644 mad.pc %{buildroot}%{_libdir}/pkgconfig/mad.pc
-touch -r mad.h.sed %{buildroot}/%{_includedir}/mad.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
-
 %files
 %defattr(-,root,root,-)
 %doc CHANGES COPYING COPYRIGHT CREDITS README TODO
@@ -93,12 +81,16 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_libdir}/libmad.a
+%{_libdir}/libmad.la
 %{_libdir}/libmad.so
 %{_libdir}/pkgconfig/mad.pc
 %{_includedir}/mad.h
 
+%changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.15.1b-20101201
+- Adjust packaging and patch logic
 
-%changelog
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.15.1b-14
 - Build for MeeGo 1.1