- release 2 (by relup.sh)

[packages/faad2.git] / faad2.spec

diff --git a/faad2.spec b/faad2.spec
index d4e580a43d41dc6fb733bb9969749950a992eabd..6a7929e94b55c7e6b08566962b72fd226bf4c7d4 100644 (file)
--- a/faad2.spec
+++ b/faad2.spec
@@ -4,28 +4,34 @@
 %bcond_without mpeg4ip         # don't build MPEG4IP plugin
 %bcond_without static_libs     # don't build static libraries
 %bcond_without xmms            # don't build XMMS plugin
-#
+
 %{?with_bootstrap:%undefine with_mpeg4ip}
 Summary:       Freeware Advanced Audio Decoder 2
 Summary(pl.UTF-8):     Darmowy zaawansowany dekoder audio
 Name:          faad2
-Version:       2.6.1
+Version:       2.7
 Release:       2
-License:       GPL
+License:       GPL v2+
 Group:         Applications/Sound
-Source0:       http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz
-# Source0-md5: 74e92df40c270f216a8305fc87603c8a
+Source0:       http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
+# Source0-md5: 4c332fa23febc0e4648064685a3d4332
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-mpeg4ip.patch
 Patch2:                %{name}-soname.patch
 Patch3:                %{name}-backward_compat.patch
+Patch4:                %{name}-mp4ff.patch
+Patch5:                %{name}-man.patch
+Patch6:                %{name}-mp4v2.patch
 URL:           http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires: SDL-devel}
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_xmms:BuildRequires:    id3lib-devel >= 3.8.2}
 BuildRequires: libtool >= 2:1.4d-3
-%{?with_mpeg4ip:BuildRequires: mpeg4ip-devel >= 1:1.6}
+%if %{with mpeg4ip}
+BuildRequires: mp4v2-devel
+BuildRequires: mpeg4ip-devel >= 1:1.6
+%endif
 %{?with_xmms:BuildRequires:    rpmbuild(macros) >= 1.125}
 %{?with_xmms:BuildRequires:    xmms-devel}
 Requires:      %{name}-libs = %{version}-%{release}
@@ -106,11 +112,15 @@ XMMS plugin for AAC files.
 Wtyczka XMMS do plików AAC.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+mv -f frontend/faad.{man,1}
 
 %build
 %{__libtoolize}
@@ -131,8 +141,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -143,24 +153,33 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/faad
+%{_mandir}/man1/faad.1*
 
 %files libs
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libfaad.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaad.so.0
+%attr(755,root,root) %{_libdir}/libmp4ff.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmp4ff.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %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
+%{_includedir}/mp4ff_int_types.h
+%{_includedir}/mp4ffint.h
 %{_includedir}/neaacdec.h
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfaad.a
+%{_libdir}/libmp4ff.a
 %endif
 
 %if %{with xmms}