Author: rathann Update of /cvs/free/rpms/faad2/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27545 Modified Files: .cvsignore faad2.spec sources Added Files: faad2-pic.patch Removed Files: faad2-cve-2008-4201.patch Log Message: * Fri Mar 13 2009 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.7-1 - update to 2.7 - don't install internal libmp4ff - include manpage - fix build on x86_64 (non-PIC objects in libmp4ff.a) - fix rpaths - make xmms plugin depend on -libs, not the frontend faad2-pic.patch: --- NEW FILE faad2-pic.patch --- diff -up faad2-2.7/common/mp4ff/Makefile.in.pic faad2-2.7/common/mp4ff/Makefile.in --- faad2-2.7/common/mp4ff/Makefile.in.pic 2009-02-10 09:36:11.000000000 +0100 +++ faad2-2.7/common/mp4ff/Makefile.in 2009-03-14 12:38:40.000000000 +0100 @@ -93,7 +94,7 @@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ +CFLAGS = @CFLAGS@ -DPIC -fPIC CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/faad2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Aug 2008 14:20:19 -0000 1.2 +++ .cvsignore 14 Mar 2009 11:55:05 -0000 1.3 @@ -1 +1 @@ -faad2-2.6.1.tar.gz +faad2-2.7.tar.bz2 Index: faad2.spec =================================================================== RCS file: /cvs/free/rpms/faad2/devel/faad2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- faad2.spec 10 Nov 2008 22:34:50 -0000 1.3 +++ faad2.spec 14 Mar 2009 11:55:05 -0000 1.4 @@ -11,18 +11,18 @@ Summary: Library and frontend for decoding MPEG2/4 AAC Name: faad2 Epoch: 1 -Version: 2.6.1 -Release: 6%{?dist} +Version: 2.7 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.audiocoding.com/faad2.html -Source: http://download.sourceforge.net/faac/%{name}-%{version}.tar.gz -Patch0: %{name}-cve-2008-4201.patch +Source: http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.bz2 +# fix non-PIC objects in libmp4ff.a +Patch0: %{name}-pic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++ BuildRequires: id3lib-devel %{!?_without_sysfs:BuildRequires: libsysfs-devel} -BuildRequires: libtool BuildRequires: xmms-devel BuildRequires: zlib-devel @@ -55,7 +55,7 @@ %package -n xmms-%{name} Summary: AAC XMMS Input Plugin Group: Applications/Multimedia -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Provides: xmms-aac = %{version}-%{release} Obsoletes: xmms-aac < 2.6.1 @@ -66,8 +66,8 @@ This package contains an input plugin for xmms. %prep -%setup -q -n %{name} -%patch0 -p1 -b .cve +%setup -q +%patch0 -p1 -b .pic find . -name "*.c" -o -name "*.h" | xargs chmod 644 for f in AUTHORS COPYING ChangeLog NEWS README* TODO ; do @@ -75,13 +75,15 @@ done %build -# This is what the README.linux file recommends -autoreconf -vif %configure \ --disable-static \ --with-xmms \ # --with-drm +# 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 + %{__make} %{?_smp_mflags} %install @@ -89,6 +91,10 @@ %{__make} install DESTDIR=%{buildroot} %{__rm} %{buildroot}%{_libdir}/libfaad.la %{__rm} %{buildroot}%{xmmsinputplugindir}/libmp4.la +%{__rm} %{buildroot}%{_includedir}/mp4ff{,int}.h +%{__rm} %{buildroot}%{_libdir}/libmp4ff.a +install -dm755 %{buildroot}%{_mandir}/man1 +%{__mv} %{buildroot}%{_mandir}/{manm/faad.man,man1/faad.1} %clean %{__rm} -rf %{buildroot} @@ -99,8 +105,9 @@ %files %defattr(-, root, root, -) -%doc AUTHORS COPYING ChangeLog NEWS README* TODO +%doc AUTHORS COPYING ChangeLog NEWS README* %{_bindir}/faad +%{_mandir}/man1/faad.1* %files libs %defattr(-,root,root,-) @@ -108,6 +115,7 @@ %files devel %defattr(-, root, root, -) +%doc TODO docs/Ahead\ AAC\ Decoder\ library\ documentation.pdf %{_includedir}/faad.h %{_includedir}/neaacdec.h %{_libdir}/libfaad.so @@ -119,6 +127,14 @@ %{xmmsinputplugindir}/libmp4.so %changelog +* Fri Mar 13 2009 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.7-1 +- update to 2.7 +- don't install internal libmp4ff +- include manpage +- fix build on x86_64 (non-PIC objects in libmp4ff.a) +- fix rpaths +- make xmms plugin depend on -libs, not the frontend + * Mon Nov 10 2008 Dominik Mierzejewski <dominik [AT] greysector [DOT] net> 1:2.6.1-6 - fix CVE-2008-4201 Index: sources =================================================================== RCS file: /cvs/free/rpms/faad2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Aug 2008 14:20:19 -0000 1.2 +++ sources 14 Mar 2009 11:55:05 -0000 1.3 @@ -1 +1 @@ -74e92df40c270f216a8305fc87603c8a faad2-2.6.1.tar.gz +4c332fa23febc0e4648064685a3d4332 faad2-2.7.tar.bz2 --- faad2-cve-2008-4201.patch DELETED ---