- preparing for external libmp4v2:

  - separate libs
  - conditionally BR mpeg4ip-devel
  - subpackage with mpeg4ip plugin
- release 3

Changed files:
    faad2.spec -> 1.12

diff --git a/faad2.spec b/faad2.spec
index c8fd179bb3beef5a60d7247128f656bbdd8c81ca..cc345b59b115019a02857bf83abbeac45a77287b 100644 (file)
--- a/faad2.spec
+++ b/faad2.spec
@@ -1,14 +1,19 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without xmms    # without XMMS plugin
+%bcond_without mpeg4ip         # build without mp4v2 support in decoder
+                               # ...and don't build XMMS or MPEG4IP plugins
+%bcond_without xmms            # don't build XMMS plugin
+%bcond_with    bootstrap       # bootstrap (alias for _without_mpeg4ip)

 #
 #

+%{?with_bootstrap:%undefine with_mpeg4ip}
+%{!?with_mpeg4ip:%undefine with_xmms}

 Summary:       Freeware Advanced Audio Decoder 2
 Summary(pl):   Darmowy zaawansowany dekoder audio
 Name:          faad2
 Version:       2.0
 Summary:       Freeware Advanced Audio Decoder 2
 Summary(pl):   Darmowy zaawansowany dekoder audio
 Name:          faad2
 Version:       2.0

-Release:       2
+Release:       3

 License:       GPL
 License:       GPL

-Group:         Libraries
+Group:         Applications/Sound

 Source0:       http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz
 # Source0-md5: 1a6f79365f2934a4888b210ef47a3a07
 Patch0:                %{name}-make.patch
 Source0:       http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz
 # Source0-md5: 1a6f79365f2934a4888b210ef47a3a07
 Patch0:                %{name}-make.patch


@@ -16,10 +21,11 @@ URL:                http://www.audiocoding.com/
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_xmms:BuildRequires:    id3lib-devel >= 3.8.2}
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_xmms:BuildRequires:    id3lib-devel >= 3.8.2}

-BuildRequires: libsndfile-devel >= 1.0.4

 BuildRequires: libtool >= 2:1.4d-3
 BuildRequires: libtool >= 2:1.4d-3

+%{?with_mpeg4ip:BuildRequires: mpeg4ip-devel >= 1.0}

 %{?with_xmms:Buildrequires:    rpmbuild(macros) >= 1.125}
 %{?with_xmms:BuildRequires:    xmms-devel}
 %{?with_xmms:Buildrequires:    rpmbuild(macros) >= 1.125}
 %{?with_xmms:BuildRequires:    xmms-devel}

+Requires:      %{name}-libs = %{version}-%{release}

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -30,14 +36,30 @@ completely written from scratch.
 FAAD 2 to napisany ca³kowicie od pocz±tku dekoder MPEG2 i MPEG-4
 obs³uguj±cy profile LC, MAIN i LTP.
 
 FAAD 2 to napisany ca³kowicie od pocz±tku dekoder MPEG2 i MPEG-4
 obs³uguj±cy profile LC, MAIN i LTP.
 

+%package libs
+Summary:       FAAD 2 libraries
+Summary(pl):   Biblioteki FAAD 2
+Group:         Libraries
+Conflicts:     faad2 < 2.0-3
+
+%description libs
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder,
+completely written from scratch. This package contains base FAAD 2
+libraries: libfaad and libmp4ff.
+
+%description libs -l pl
+FAAD 2 to napisany ca³kowicie od pocz±tku dekoder MPEG2 i MPEG-4
+obs³uguj±cy profile LC, MAIN i LTP. Ten pakiet zawiera podstawowe
+biblioteki FAAD 2: libfaad i libmp4ff.
+

 %package devel
 %package devel

-Summary:       Devel files for faad2
+Summary:       Header files for faad2

 Summary(pl):   Pliki nag³ówkowe faad2
 Group:         Development/Libraries
 Summary(pl):   Pliki nag³ówkowe faad2
 Group:         Development/Libraries

-Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}-%{release}

 
 %description devel
 
 %description devel

-Devel files for faad2.
+Header files for faad2.

 
 %description devel -l pl
 Pliki nag³ówkowe faad2.
 
 %description devel -l pl
 Pliki nag³ówkowe faad2.


@@ -46,7 +68,7 @@ Pliki nag
 Summary:       Static faad2 library
 Summary(pl):   Statyczna biblioteka faad2
 Group:         Development/Libraries
 Summary:       Static faad2 library
 Summary(pl):   Statyczna biblioteka faad2
 Group:         Development/Libraries

-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}

 
 %description static
 Static faad2 library.
 
 %description static
 Static faad2 library.


@@ -54,11 +76,24 @@ Static faad2 library.
 %description static -l pl
 Statyczna biblioteka faad2.
 
 %description static -l pl
 Statyczna biblioteka faad2.
 

+%package -n mpeg4ip-plugin-faad2
+Summary:       MPEG4IP plugin for AAC files
+Summary(pl):   Wtyczka MPEG4IP do plików AAC
+Group:         Applications/Sound
+Requires:      %{name}-libs = %{version}-%{release}
+Requires:      mpeg4ip
+
+%description -n mpeg4ip-plugin-faad2
+MPEG4IP plugin for AAC files.
+
+%description -n mpeg4ip-plugin-faad2 -l pl
+Wtyczka MPEG4IP do plików AAC.
+

 %package -n xmms-input-faad2
 Summary:       XMMS plugin for AAC files
 Summary(pl):   Wtyczka XMMS do plików AAC
 Group:         X11/Applications/Sound
 %package -n xmms-input-faad2
 Summary:       XMMS plugin for AAC files
 Summary(pl):   Wtyczka XMMS do plików AAC
 Group:         X11/Applications/Sound

-Requires:      %{name} = %{version}
+Requires:      %{name}-libs = %{version}-%{release}

 Requires:      xmms
 
 %description -n xmms-input-faad2
 Requires:      xmms
 
 %description -n xmms-input-faad2


@@ -78,7 +113,6 @@ Wtyczka XMMS do plik
 %{__autoheader}
 %{__automake}
 %configure \
 %{__autoheader}
 %{__automake}
 %configure \

-       --with-mp4v2 \

        %{?with_xmms:--with-xmms}
 
 %{__make}
        %{?with_xmms:--with-xmms}
 
 %{__make}


@@ -94,27 +128,41 @@ rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig

 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

+%attr(755,root,root) %{_bindir}/faad
+
+%files libs
+%defattr(644,root,root,755)

 %doc AUTHORS ChangeLog NEWS README TODO
 %doc AUTHORS ChangeLog NEWS README TODO

-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libfaad.so.*.*
+%attr(755,root,root) %{_libdir}/libmp4ff.so.*.*

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libfaad.so
+%attr(755,root,root) %{_libdir}/libmp4ff.so
+%{_libdir}/libfaad.la
+%{_libdir}/libmp4ff.la
+%{_includedir}/faad.h
+%{_includedir}/mp4ff.h

 
 %files static
 %defattr(644,root,root,755)
 
 %files static
 %defattr(644,root,root,755)

-%{_libdir}/lib*.a
+%{_libdir}/libfaad.a
+%{_libdir}/libmp4ff.a

 
 %if %{with xmms}
 %files -n xmms-input-faad2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xmms_input_plugindir}/*.so
 %endif
 
 %if %{with xmms}
 %files -n xmms-input-faad2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xmms_input_plugindir}/*.so
 %endif

+
+%if %{with mpeg4ip}
+%files -n mpeg4ip-plugin-faad2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/mp4player_plugin/*.so
+%endif