4:25 p.m.
Author: rathann
Update of /cvs/free/rpms/faac/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9171
Modified Files:
.cvsignore faac.spec sources
Added Files:
faac-libmp4v2.patch
Removed Files:
faac-1.25-enable-libmp4v2.patch
Log Message:
- sync with devel branch, no ABI changes
faac-libmp4v2.patch:
--- NEW FILE faac-libmp4v2.patch ---
diff -up faac-1.28/configure.in.mp4v2 faac-1.28/configure.in
--- faac-1.28/configure.in.mp4v2 2009-02-05 01:55:38.000000000 +0100
+++ faac-1.28/configure.in 2009-03-12 01:42:20.000000000 +0100
@@ -36,6 +36,8 @@ AC_CHECK_DECLS([MP4Create, MP4MetadataDe
if test x$external_mp4v2 = xyes; then
AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+ MY_DEFINE(HAVE_LIBMP4V2)
+ LIBS="-lmp4v2 $LIBS"
else
if test x$WITHMP4V2 = xyes; then
AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff -up faac-1.28/configure.mp4v2 faac-1.28/configure
--- faac-1.28/configure.mp4v2 2009-02-10 09:36:58.000000000 +0100
+++ faac-1.28/configure 2009-03-12 01:42:20.000000000 +0100
@@ -19938,6 +19938,13 @@ fi
if test x$external_mp4v2 = xyes; then
{ echo "$as_me:$LINENO: *** Building with external mp4v2 ***" >&5
echo "$as_me: *** Building with external mp4v2 ***" >&6;}
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LIBMP4V2 1
+_ACEOF
+
+LIBS="-lmp4v2 $LIBS"
+
else
if test x$WITHMP4V2 = xyes; then
{ echo "$as_me:$LINENO: *** Building with internal mp4v2 ***" >&5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/faac/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 Jul 2008 17:58:28 -0000 1.2
+++ .cvsignore 22 Mar 2009 16:25:34 -0000 1.3
@@ -1 +1 @@
-faac-1.25.tar.gz
+faac-1.28.tar.bz2
Index: faac.spec
===================================================================
RCS file: /cvs/free/rpms/faac/F-10/faac.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- faac.spec 27 Nov 2008 05:54:14 -0000 1.6
+++ faac.spec 22 Mar 2009 16:25:34 -0000 1.7
@@ -1,21 +1,17 @@
Name: faac
-Version: 1.25
-Release: 7%{?dist}
+Version: 1.28
+Release: 1%{?dist}
Summary: Encoder and encoding library for MPEG2/4 AAC
Group: Applications/Multimedia
-License: LGPL2+
+License: LGPLv2+
URL: http://www.audiocoding.com/
-Source0: http://download.sourceforge.net/sourceforge/faac/faac-1.25.tar.gz
-Patch0: faac-1.25-enable-libmp4v2.patch
+Source0:
http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.t...
+Patch0: %{name}-libmp4v2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libmp4v2-devel
-BuildRequires: libtool
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: dos2unix
%description
@@ -36,14 +32,21 @@
This package contains development files and documentation for libfaac.
%prep
-%setup -q -n %{name}
-find . -type f -print|xargs dos2unix
-%patch0 -p1 -b .patch0
-chmod 0644 COPYING ChangeLog README TODO
+%setup -q
+%patch0 -p1 -b .mp4v2
+touch -r configure.in.mp4v2 configure.in
+#fix permissions
+find . -type f \( -name \*.h -or -name \*.c \) -exec chmod 644 {} \;
+chmod 644 AUTHORS COPYING ChangeLog NEWS README TODO docs/*
+
+#fix encoding
+/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && touch -r
AUTHORS AUTHORS.conv && /bin/mv -f AUTHORS.conv AUTHORS
%build
-sh ./bootstrap
%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
make %{?_smp_mflags}
@@ -63,9 +66,10 @@
%files
%defattr(-,root,root,-)
-%doc COPYING ChangeLog README TODO
+%doc AUTHORS COPYING ChangeLog NEWS README TODO docs/*
%{_bindir}/*
%{_libdir}/*.so.*
+%{_mandir}/man1/%{name}*
%files devel
%defattr(-,root,root,-)
@@ -74,6 +78,20 @@
%{_includedir}/*.h
%changelog
+* Thu Mar 12 2009 Dominik Mierzejewski <rpm [AT] greysector [DOT] net> - 1.28-1
+- update to 1.28
+- drop redundant BRs
+- fix Source URL and use bz2 tarball
+- fix rpath
+- include manpage
+- ship AUTHORS NEWS docs/*
+- integrated changes from Julian Sikorski <belegdol[at]gmail[dot]com>
+-- Dropped dos2unix BR, not needed anymore
+-- Made Source0 use macros
+-- Fixed License tag
+-- Fixed file permissions
+-- Converted ChangeLog to utf-8
+
* Tue Nov 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.25-7
- chmod 644 all docs (fixes #115)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/faac/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 Jul 2008 17:58:28 -0000 1.2
+++ sources 22 Mar 2009 16:25:34 -0000 1.3
@@ -1 +1 @@
-75eaffd18ee072eaca52ae2d622bb1db faac-1.25.tar.gz
+c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2
--- faac-1.25-enable-libmp4v2.patch DELETED ---