rpms/libvorbis/devel libvorbis-1.2.3-add-needed.patch, NONE, 1.1 libvorbis.spec, 1.42, 1.43

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/libvorbis/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3769

Modified Files:
	libvorbis.spec 
Added Files:
	libvorbis-1.2.3-add-needed.patch 
Log Message:
* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.2.3-5
- libvorbis-1.2.3-add-needed.patch: Fix FTBFS from --no-add-needed


libvorbis-1.2.3-add-needed.patch:
 examples/Makefile.in |    4 ++--
 test/Makefile.in     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE libvorbis-1.2.3-add-needed.patch ---
diff -up libvorbis-1.2.3/examples/Makefile.in.jx libvorbis-1.2.3/examples/Makefile.in
--- libvorbis-1.2.3/examples/Makefile.in.jx	2009-07-09 22:19:15.000000000 -0400
+++ libvorbis-1.2.3/examples/Makefile.in	2010-02-09 10:03:06.000000000 -0500
@@ -231,9 +231,9 @@ EXTRA_DIST = frameview.pl
 # uncomment to build static executables from the example code
 #LDFLAGS = -all-static 
 decoder_example_SOURCES = decoder_example.c
-decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la 
+decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la -logg -lm
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la 
+encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la -logg
 chaining_example_SOURCES = chaining_example.c
 chaining_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la 
 vorbisfile_example_SOURCES = vorbisfile_example.c
diff -up libvorbis-1.2.3/test/Makefile.in.jx libvorbis-1.2.3/test/Makefile.in
--- libvorbis-1.2.3/test/Makefile.in.jx	2009-07-09 22:19:15.000000000 -0400
+++ libvorbis-1.2.3/test/Makefile.in	2010-02-09 10:08:03.000000000 -0500
@@ -204,7 +204,7 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
 test_SOURCES = util.c util.h write_read.c write_read.h test.c
-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@
+test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ -lm
 all: all-am
 
 .SUFFIXES:


Index: libvorbis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- libvorbis.spec	23 Nov 2009 22:36:03 -0000	1.42
+++ libvorbis.spec	9 Feb 2010 15:11:21 -0000	1.43
@@ -1,7 +1,7 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Name:		libvorbis
 Version:	1.2.3
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:		1
 Group:		System Environment/Libraries
 License:	BSD
@@ -11,6 +11,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildRequires: 	libogg-devel >= 2:1.1
 Patch0:		r16326.diff
 Patch1:		r16597.diff
+Patch2:		libvorbis-1.2.3-add-needed.patch
 
 %description
 Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free,
@@ -44,6 +45,7 @@ Documentation for developing application
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 sed -i "s/-O20/$RPM_OPT_FLAGS/" configure
 sed -i "s/-ffast-math//" configure
 
@@ -86,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Feb 09 2010 Adam Jackson <ajax at redhat.com> 1.2.3-5
+- libvorbis-1.2.3-add-needed.patch: Fix FTBFS from --no-add-needed
+
 * Mon Nov 23 2009 Adam Jackson <ajax at redhat.com> 1.2.3-4
 - Fix doc subpackage build (#540634)