12:49 a.m.
Author: rathann
Update of /cvs/free/rpms/faac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30028
Modified Files:
.cvsignore faac.spec sources
Added Files:
faac-libmp4v2.patch
Removed Files:
faac-1.25-enable-libmp4v2.patch
Log Message:
* 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
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/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Dec 2008 15:01:21 -0000 1.3
+++ .cvsignore 12 Mar 2009 00:49:56 -0000 1.4
@@ -1 +1 @@
-faac-1.26.tar.gz
+faac-1.28.tar.bz2
Index: faac.spec
===================================================================
RCS file: /cvs/free/rpms/faac/devel/faac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- faac.spec 14 Dec 2008 15:01:21 -0000 1.5
+++ faac.spec 12 Mar 2009 00:49:56 -0000 1.6
@@ -1,20 +1,17 @@
Name: faac
-Version: 1.26
+Version: 1.28
Release: 1%{?dist}
Summary: Encoder and encoding library for MPEG2/4 AAC
Group: Applications/Multimedia
License: LGPLv2+
URL: http://www.audiocoding.com/
-Source0:
http://download.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.ta...
-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
%description
@@ -35,20 +32,21 @@
This package contains development files and documentation for libfaac.
%prep
-%setup -q -n %{name}
-%patch0 -p1 -b .patch0
-
+%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 ChangeLog > ChangeLog.conv && /bin/mv -f
ChangeLog.conv ChangeLog
-/usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && /bin/mv -f
AUTHORS.conv AUTHORS
+/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}
@@ -71,6 +69,7 @@
%doc AUTHORS COPYING ChangeLog NEWS README TODO docs/*
%{_bindir}/*
%{_libdir}/*.so.*
+%{_mandir}/man1/%{name}*
%files devel
%defattr(-,root,root,-)
@@ -79,6 +78,13 @@
%{_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
+
* Sun Dec 14 2008 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.26-1
- ship AUTHORS NEWS docs/*
- integrated changes from Julian Sikorski <belegdol[at]gmail[dot]com>
Index: sources
===================================================================
RCS file: /cvs/free/rpms/faac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 14 Dec 2008 15:01:21 -0000 1.3
+++ sources 12 Mar 2009 00:49:56 -0000 1.4
@@ -1 +1 @@
-1d7c019bd2dbb4f3101b8937ebc59cf6 faac-1.26.tar.gz
+c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2
--- faac-1.25-enable-libmp4v2.patch DELETED ---