diff --git a/libvorbis-1.2.3-add-needed.patch b/libvorbis-1.3.4-add-needed.patch similarity index 63% rename from libvorbis-1.2.3-add-needed.patch rename to libvorbis-1.3.4-add-needed.patch index d4869bf..04eb144 100644 --- a/libvorbis-1.2.3-add-needed.patch +++ b/libvorbis-1.3.4-add-needed.patch @@ -1,7 +1,17 @@ -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 +--- libvorbis-1.3.4/test/Makefile.in.orig 2014-01-22 21:39:49.566896605 +0000 ++++ libvorbis-1.3.4/test/Makefile.in 2014-01-22 21:40:04.961760598 +0000 +@@ -234,7 +234,7 @@ + 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@ @VORBIS_LIBS@ ++test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@ -lm + all: all-am + + .SUFFIXES: +--- libvorbis-1.3.4/examples/Makefile.in.orig 2014-01-22 11:39:50.000000000 +0000 ++++ libvorbis-1.3.4/examples/Makefile.in 2014-01-22 21:39:49.566896605 +0000 +@@ -263,9 +263,9 @@ # uncomment to build static executables from the example code #LDFLAGS = -all-static decoder_example_SOURCES = decoder_example.c @@ -13,15 +23,3 @@ diff -up libvorbis-1.2.3/examples/Makefile.in.jx libvorbis-1.2.3/examples/Makefi 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: diff --git a/libvorbis.spec b/libvorbis.spec index b742cac..6c37bd9 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -10,7 +10,7 @@ License: BSD URL: http://www.xiph.org/ Source: http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz BuildRequires: libogg-devel >= 2:1.1 -Patch2: libvorbis-1.2.3-add-needed.patch +Patch0: libvorbis-1.3.4-add-needed.patch %description Ogg Vorbis is a fully open, non-proprietary, patent- and royalty-free, @@ -43,7 +43,7 @@ Documentation for developing applications with libvorbis. %prep %setup -q -%patch2 -p1 +%patch0 -p1 -b .needed sed -i "s/-O20/$RPM_OPT_FLAGS/" configure sed -i "s/-ffast-math//" configure sed -i "s/-mcpu=750//" configure