diff -r 4f133201e207 -r 4667f24fe848 lame/lame.spec
--- a/lame/lame.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/lame/lame.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,19 +1,16 @@
 Name:           lame
 Version:        3.98.4
-Release:        1.4
+Release:        20101201
 Summary:        Free MP3 audio compressor
-
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://lame.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/lame/%{name}-%{version}.tar.gz
-Patch1:         %{name}-noexecstack.patch
-Patch2:         %{name}-pmake.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  ncurses-devel
-BuildRequires:  gtk+-devel
-# pkg-config should be pulled in by gtk+-devel but is not in EL-5
 BuildRequires:  pkgconfig
 %ifarch %{ix86}
 BuildRequires:  nasm
@@ -27,77 +24,61 @@
 
 %package        libs
 Summary:        LAME MP3 encoding library
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          System Environment/Libraries
 
 %description    libs
+LAME is an open source MP3 encoder whose quality and speed matches
+commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding
+with both constant and variable bitrates. This package provides the
 LAME MP3 encoding library.
 
 %package        devel
 Summary:        Development files for %{name}
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
 Group:          Development/Libraries
 Requires:       %{name}-libs = %{version}-%{release}
 
 %description    devel
-This package development files for %{name}.
-
-%package        mp3x
-Summary:        MP3 frame analyzer
-Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
-
-%description    mp3x
-This package contains the mp3x frame analyzer.
-
+LAME is an open source MP3 encoder whose quality and speed matches
+commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding
+with both constant and variable bitrates. This package provides
+development files for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1 -b .noexec
-%patch2 -p1 -b .pmake
 iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && touch -r ChangeLog ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
 
-
 %build
-#sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
-#export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
-unset CFLAGS
-unset CXXFLAGS
-unset FFLAGS
-unset LD_AS_NEEDED
 %configure \
-  --disable-dependency-tracking \
-  --disable-static \
 %ifarch %{ix86}
   --enable-nasm \
 %endif
-  --enable-mp3x \
   --enable-mp3rtp \
   --enable-decode-layer1
 
-make
-echo $CFLAGS
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-# Some apps still expect to find <lame.h>
-ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
-
 %check
-make test
-
+%{__make} test
 
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %files
 %defattr (-,root,root,-)
 %doc README TODO USAGE doc/html/*.html doc/html/*.css
@@ -113,14 +94,13 @@
 %files devel
 %defattr (-,root,root,-)
 %doc API HACKING STYLEGUIDE
+%{_libdir}/libmp3lame.a
 %{_libdir}/libmp3lame.so
-%{_includedir}/lame/
-%{_includedir}/lame.h
-
-%files mp3x
-%defattr (-,root,root,-)
-%{_bindir}/mp3x
+%{_includedir}/lame
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 3.98.4-20101201
+- Adjust packaging
+
 * Fri Oct 29 2010 Kozinov Ivan <kozinov@gmail.com> - 3.98.4-1
-- Build for 1.1
+- Package for MeeGo 1.1