[packages/lame] automake 1.12 fix (disable ansi2knr)

jajcus jajcus at pld-linux.org
Thu Dec 6 15:44:21 CET 2012


commit 9038bea8b5c97a9a22169ffba36e93ad13df2e9b
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Thu Dec 6 15:43:39 2012 +0100

    automake 1.12 fix (disable ansi2knr)

 lame-automake_1_12.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 lame.spec                |  2 ++
 2 files changed, 46 insertions(+)
---
diff --git a/lame.spec b/lame.spec
index 2280559..ad4415a 100644
--- a/lame.spec
+++ b/lame.spec
@@ -17,6 +17,7 @@ Source0:	http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz
 # Source0-md5:	5ad31e33e70455eb3a7b79a5dd934fce
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-without_gtk.patch
+Patch2:		%{name}-automake_1_12.patch
 URL:		http://lame.sourceforge.net/
 BuildRequires:	autoconf >= 2.68
 BuildRequires:	automake
@@ -113,6 +114,7 @@ Analizator ramek w GTK+.
 %setup -q
 %patch0 -p1
 %{!?with_gtk:%patch1 -p1}
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/lame-automake_1_12.patch b/lame-automake_1_12.patch
new file mode 100644
index 0000000..0f9d862
--- /dev/null
+++ b/lame-automake_1_12.patch
@@ -0,0 +1,44 @@
+diff -dur -x '*~' lame-3.99.3.orig/configure.in lame-3.99.3/configure.in
+--- lame-3.99.3.orig/configure.in	2012-12-06 15:38:39.000000000 +0100
++++ lame-3.99.3/configure.in	2012-12-06 15:40:18.000000000 +0100
+@@ -73,7 +73,6 @@
+ fi
+ 
+ dnl more automake stuff
+-AM_C_PROTOTYPES
+ 
+ AC_CHECK_HEADER(dmalloc.h)
+ if test "${ac_cv_header_dmalloc_h}" = "yes"; then
+diff -dur -x '*~' lame-3.99.3.orig/doc/html/Makefile.am lame-3.99.3/doc/html/Makefile.am
+--- lame-3.99.3.orig/doc/html/Makefile.am	2010-09-30 22:58:40.000000000 +0200
++++ lame-3.99.3/doc/html/Makefile.am	2012-12-06 15:40:43.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ docdir = $(datadir)/doc
+ pkgdocdir = $(docdir)/$(PACKAGE)
+diff -dur -x '*~' lame-3.99.3.orig/doc/man/Makefile.am lame-3.99.3/doc/man/Makefile.am
+--- lame-3.99.3.orig/doc/man/Makefile.am	2000-10-22 13:39:44.000000000 +0200
++++ lame-3.99.3/doc/man/Makefile.am	2012-12-06 15:40:30.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ man_MANS = lame.1
+ EXTRA_DIST = ${man_MANS}
+diff -dur -x '*~' lame-3.99.3.orig/libmp3lame/i386/Makefile.am lame-3.99.3/libmp3lame/i386/Makefile.am
+--- lame-3.99.3.orig/libmp3lame/i386/Makefile.am	2011-04-04 11:42:34.000000000 +0200
++++ lame-3.99.3/libmp3lame/i386/Makefile.am	2012-12-06 15:41:08.000000000 +0100
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
+ 
+-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
++AUTOMAKE_OPTIONS = foreign
+ 
+ DEFS = @DEFS@ @CONFIG_DEFS@
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lame.git/commitdiff/9038bea8b5c97a9a22169ffba36e93ad13df2e9b



More information about the pld-cvs-commit mailing list