diff -r 4f133201e207 -r 4667f24fe848 twolame/twolame.spec
--- a/twolame/twolame.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/twolame/twolame.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,71 +1,66 @@
-Name:		twolame
-Version:	0.3.12
-Release:	5.4
-Summary:	TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME
-Group:		Applications/Multimedia
-License:	LGPLv2+
-URL:		http://www.twolame.org/
-Source:		http://downloads.sourceforge.net/twolame/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	libsndfile-devel
-#BuildRequires:	libtool
+Name:           twolame
+Summary:        TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME
+Vendor:         Europalab Software
+Packager:       Michael Schloh von Bennewitz
+Distribution:   MeeGo Thirdparty
+Group:          Applications/Multimedia
+Version:        0.3.12
+Release:        20101201
+License:        LGPLv2+
+URL:            http://www.twolame.org/
+Source:         http://downloads.sourceforge.net/twolame/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires:  libsndfile-devel
 
 %description
 TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME,
-which in turn is based heavily on
-- the ISO dist10 code
-- improvement to algorithms as part of the LAME project (www.sulaco.org/mp3)
+which in turn is based heavily on the ISO dist10 code and improvement to
+algorithms as part of the LAME project (www.sulaco.org/mp3).
 
 This package contains the command line frontend.
                                                                                 
 %package libs
-Summary:	TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME
-Group:		System Environment/Libraries
-Obsoletes:	%{name} < 0.3.12-1
+Summary:    TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME
+Vendor:     Europalab Software
+Packager:   Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:      System Environment/Libraries
+Obsoletes:  %{name} < 0.3.12-1
 
 %description libs
 TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME,
-which in turn is based heavily on
-- the ISO dist10 code
-- improvement to algorithms as part of the LAME project (www.sulaco.org/mp3)
+which in turn is based heavily on the ISO dist10 code and improvement to
+algorithms as part of the LAME project (www.sulaco.org/mp3).
 
 This package contains the shared library.
 
 %package devel
-Summary:	Development tools for TwoLAME applications
-Group:		Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	pkgconfig
+Summary:   Development tools for TwoLAME applications
+Vendor:    Europalab Software
+Packager:   Michael Schloh von Bennewitz
+Distribution: MeeGo Thirdparty
+Group:     Development/Libraries
+Requires:  %{name}-libs = %{version}-%{release}
+Requires:  pkgconfig
 
 %description devel
-This package contains the header files and documentation
-needed to develop applications with TwoLAME.
+TwoLAME is an optimised MPEG Audio Layer 2 encoding library based on tooLAME,
+which in turn is based heavily on the ISO dist10 code and improvement to
+algorithms as part of the LAME project (www.sulaco.org/mp3).
+
+This package contains the header files and documentation needed to
+develop applications with TwoLAME.
 
 %prep
 %setup -q
-# convert manpage to UTF8
-pushd doc
-iconv -f iso8859-1 -t utf8 %{name}.1 > %{name}.1.utf && mv %{name}.1.utf %{name}.1
-# fix HTML docs line endings
-for file in html/*.html ; do
-	tr -d '\r' <$file >$file.unix && mv $file.unix $file
-done
-popd
 
 %build
-#autoreconf -f -i
-%configure --disable-static
-
-# remove rpath from libtool
-sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
+%configure
 %{__make} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -rf $RPM_BUILD_ROOT%{_docdir}
 
 %clean 
@@ -89,10 +84,15 @@
 %defattr(644,root,root,755)
 %doc doc/api.txt doc/html doc/psycho.txt doc/vbr.txt
 %{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/lib%{name}.a
+%{_libdir}/lib%{name}.la
 %{_libdir}/lib%{name}.so
 %{_includedir}/%{name}.h
 
 %changelog
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 0.3.12-20101201
+- Adjust packaging
+
 * Mon Nov 1 2010 Kozinov Ivan <kozinov@gmail.com> - 0.3.12-5
 - Build for MeeGo 1.1