diff -r 4f133201e207 -r 4667f24fe848 faad2/faad2.spec
--- a/faad2/faad2.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/faad2/faad2.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,57 +1,59 @@
-Summary:	Library and frontend for decoding MPEG2/4 AAC
-Name:		faad2
-Epoch:		1
-Version:	2.7
-Release:	1%{?dist}
-License:	GPLv2+
-Group:		Applications/Multimedia
-URL:		http://www.audiocoding.com/faad2.html
-Source:		http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2
-# fix non-PIC objects in libmp4ff.a
-Patch0:		%{name}-pic.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:	gcc-c++
-BuildRequires:	id3lib-devel
+Name:          faad2
+Summary:       Library and frontend for decoding MPEG2/4 AAC
+Vendor:        Europalab Software
+Packager:      Michael Schloh von Bennewitz
+Distribution:  MeeGo Thirdparty
+Version:       2.7
+Release:       20101201
+License:       GPLv2+
+Group:         Applications/Multimedia
+URL:           http://www.audiocoding.com/faad2.html
+Source:        http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gcc-c++
+BuildRequires: libid3tag-devel
 BuildRequires: libsysfs-devel
-BuildRequires:	zlib-devel
+BuildRequires: zlib-devel
 
 %description
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
 
 %package libs
-Summary:	Shared libraries of the FAAD 2 AAC decoder
-Group:		System Environment/Libraries
-Obsoletes:	%{name} < 1:2.6.1-3
+Summary:   Shared libraries of the FAAD 2 AAC decoder
+Vendor:    Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     System Environment/Libraries
 
 %description libs
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-This package contains libfaad.
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+This package provides the libraries for %{name}.
 
 %package devel
-Summary:	Development libraries of the FAAD 2 AAC decoder
-Group:		Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Summary:  Development libraries of the FAAD 2 AAC decoder
+Vendor:   Europalab Software
+Packager:  Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:    Development/Libraries
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-This package contains development files and documentation for libfaad.
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder.
+This package provides development files and documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1 -b .pic
 find . -name "*.c" -o -name "*.h" | xargs chmod 644
+mv \
+    docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf \
+    docs/AACDecoderLibrary.pdf
 
-for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do
+for f in AUTHORS COPYING ChangeLog NEWS README* TODO; do
     tr -d '\r' <$f >$f.n && touch -r $f $f.n && mv -f $f.n $f
 done
 
 %build
-%configure  --disable-static 
+%configure
 
 # remove rpath from libtool
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -62,9 +64,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
-%{__rm} %{buildroot}%{_libdir}/libfaad.la
-%{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h
-%{__rm} %{buildroot}%{_libdir}/libmp4ff.a
 install -dm755 %{buildroot}%{_mandir}/man1
 %{__mv} %{buildroot}%{_mandir}/{manm/faad.man,man1/faad.1}
 
@@ -87,11 +86,19 @@
 
 %files devel
 %defattr(-, root, root, -)
-%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf
+%doc TODO docs/AACDecoderLibrary.pdf
 %{_includedir}/faad.h
 %{_includedir}/neaacdec.h
+%{_includedir}/mp4ff.h
+%{_includedir}/mp4ffint.h
+%{_libdir}/libfaad.a
+%{_libdir}/libfaad.la
 %{_libdir}/libfaad.so
+%{_libdir}/libmp4ff.a
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 2.7-20101201
+- Adjust packaging and patch logic
+
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> 1:2.7-1
-- Build for MeeGo 1.1
+- Package for MeeGo 1.1