@@ -4,21 +4,20 @@

 #

 # Please submit bugfixes or comments to toni@links2linux.de

-# norootforbuild

-

-Name:          twolame

-Summary:       TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder

-Version:       0.3.12

-Release:       2.4

-License:       GPL

-Group:         Productivity/Multimedia/Sound/Utilities

-URL:           http://www.twolame.org/

-Source:                 http://prdownloads.sourceforge.net/twolame/%{name}-%{version}.tar.bz2

-BuildRoot:     %{_tmppath}/%{name}-%{version}-build

-BuildRequires: flac-devel

-BuildRequires: libsndfile-devel

-BuildRequires: pkgconfig

-BuildRequires:  autoconf automake

+Name:           twolame

+Version:        0.3.13

+%define sonum   0

+Release:        2.5

+License:        LGPL-2.1

+Summary:        An optimised MPEG Audio Layer 2 (MP2) encoder

+Url:            http://www.twolame.org/

+Group:          Productivity/Multimedia/Sound/Utilities

+Source0:        http://prdownloads.sourceforge.net/twolame/%{name}-%{version}.tar.gz

+Source1:        baselibs.conf

+BuildRequires:  flac-devel

+BuildRequires:  libsndfile-devel

+BuildRequires:  pkgconfig

+BuildRoot:      %{_tmppath}/%{name}-%{version}-build

 %description

 TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on

@@ -26,11 +25,11 @@

 code and portions of LAME. TwoLAME includes libtwolame, a fully

 thread-safe shared library with an API very similar to LAME's.

-%package -n libtwolame0

-Summary:   Shared libraries for TwoLame

-Group:     System/Libraries

+%package -n lib%{name}%{sonum}

+Summary:        Shared libraries for TwoLame

+Group:          System/Libraries

-%description -n libtwolame0

+%description -n lib%{name}%{sonum}

 TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on

 tooLAME by Mike Cheng, which in turn is based upon the ISO dist10

 code and portions of LAME. TwoLAME includes libtwolame, a fully

@@ -38,72 +37,58 @@

 This package contains the shared libraries for TwoLame.

-%package -n libtwolame-devel

-Summary:   Include Files and Libraries mandatory for Development

-Group:     Development/Libraries/C and C++

-Requires:  libtwolame0 = %{version}

-Provides:  twolame-devel = 0.3.10

-Obsoletes: twolame-devel < 0.3.10

+%package -n lib%{name}-devel

+Summary:        Include Files and Libraries mandatory for Development

+Group:          Development/Libraries/C and C++

+Requires:       lib%{name}%{sonum} = %{version}

+Provides:       %{name}-devel = 0.3.10

+Obsoletes:      %{name}-devel < 0.3.10

-%description -n libtwolame-devel

+%description -n lib%{name}-devel

 This package contains all necessary include files and libraries needed

 to develop applications that require these.

 %prep

-%setup -q -n %{name}-%{version}

-%{?suse_update_config:%{suse_update_config -f}}

+%setup -q

-%__sed -i 's|\r||g' doc/html/*.html

-%__chmod 644        doc/html/*.html

+sed -i 's|\r||g' doc/html/*.html

+chmod 644        doc/html/*.html

 %build

 %configure --disable-static

-%__make %{?jobs:-j%{jobs}}

+make %{?_smp_mflags}

 %install

 %makeinstall

-%__install -dm 755 %{buildroot}%{_docdir}

-%__mv %{buildroot}%{_datadir}/doc/%{name} \

-   %{buildroot}%{_docdir}/%{name}-devel

+install -dm 755 %{buildroot}%{_docdir}

+mv %{buildroot}%{_datadir}/doc/%{name} \

+    %{buildroot}%{_docdir}/%{name}-devel

-%__rm %{buildroot}%{_libdir}/*.la

+rm %{buildroot}%{_libdir}/*.la

 %clean

-[ -d %{buildroot} -a "%{buildroot}" != "" ] && %__rm -rf %{buildroot}

-

-%post -n libtwolame0 -p /sbin/ldconfig

+[ -d %{buildroot} -a %{buildroot} != "" ] && rm -rf %{buildroot}

-%postun -n libtwolame0 -p /sbin/ldconfig

+%post   -n lib%{name}%{sonum} -p /sbin/ldconfig

+%postun -n lib%{name}%{sonum} -p /sbin/ldconfig

 %files

 %defattr(-,root,root)

 %doc AUTHORS COPYING ChangeLog README TODO

-%{_bindir}/twolame

-%{_mandir}/man1/twolame.1*

+%{_bindir}/%{name}

+%{_mandir}/man1/%{name}.1*

-%files -n libtwolame0

+%files -n lib%{name}%{sonum}

 %defattr(-,root,root)

-%{_libdir}/libtwolame.so.0

-%{_libdir}/libtwolame.so.0.*.*

+%{_libdir}/lib%{name}.so.%{sonum}*

+%{_libdir}/lib%{name}.so.%{sonum}

-%files -n libtwolame-devel

+%files -n lib%{name}-devel

 %defattr(-,root,root)

-%doc %{_docdir}/twolame-devel

-%{_includedir}/*

-%{_libdir}/libtwolame.so

+%doc %{_docdir}/%{name}-devel

 %{_includedir}/*

-%{_libdir}/pkgconfig/twolame.pc

+%{_libdir}/lib%{name}.so

+%{_libdir}/pkgconfig/%{name}.pc

 %changelog

-* Wed Jan  9 2008 toni@links2linux.de

-- update to 3.12

-- changed package layout according Shared Library Packaging Policy

-* Wed Mar 21 2007 toni@links2linux.de

-- update to 3.10

-* Sun Dec 31 2006 toni@links2linux.de

-- update to 3.9

-* Sun Sep 17 2006 toni@links2linux.de

-- build for packman

-* Sat Jul 29 2006 oc2pus@arcor.de

-- initial release 0.3.8

​