# HG changeset patch # User Michael Schloh von Bennewitz # Date 1286470930 -7200 # Node ID 2d6f7c9a136be0a76f47eb2e4e28c9115b66267d # Parent 27f2b2f863ff0e4f96df38fa25a610b4d6707bf9 Update to new vendor version and remove patch accordingly. diff -r 27f2b2f863ff -r 2d6f7c9a136b mpg123/mpg123.patch --- a/mpg123/mpg123.patch Fri Aug 27 15:56:07 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,33 +0,0 @@ -Index: src/Makefile.in ---- src/Makefile.in.orig 2007-12-05 02:36:29 +0100 -+++ src/Makefile.in 2007-12-05 08:34:08 +0100 -@@ -57,7 +57,7 @@ - term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) - mpg123_OBJECTS = $(am_mpg123_OBJECTS) - am__DEPENDENCIES_1 = --DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl - depcomp = $(SHELL) $(top_srcdir)/build/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -294,7 +294,7 @@ - - # AM_CPPFLAGS = - mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ --mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -+mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -static - # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. - INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123 - # libltdl is not mentioned here... it's not that trivial -Index: src/output/Makefile.in ---- src/output/Makefile.in.orig 2007-12-05 02:36:30 +0100 -+++ src/output/Makefile.in 2007-12-05 08:33:30 +0100 -@@ -212,7 +212,7 @@ - output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS) - @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@am_output_win32_la_rpath = -rpath \ - @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@ $(pkglibdir) --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl - depcomp = $(SHELL) $(top_srcdir)/build/depcomp - am__depfiles_maybe = depfiles - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff -r 27f2b2f863ff -r 2d6f7c9a136b mpg123/mpg123.spec --- a/mpg123/mpg123.spec Fri Aug 27 15:56:07 2010 +0200 +++ b/mpg123/mpg123.spec Thu Oct 07 19:02:10 2010 +0200 @@ -31,15 +31,14 @@ Class: PLUS Group: Audio License: GPL -Version: 1.6.3 -Release: 20090106 +Version: 1.12.3 +Release: 20100728 # package options %option with_dev no # list of sources Source0: http://www.mpg123.de/download/mpg123-%{version}.tar.bz2 -Patch0: mpg123.patch # build information Prefix: %{l_prefix} @@ -61,7 +60,6 @@ %prep %setup -q - %patch -p0 %build CC="%{l_cc}" \