Thu, 07 Oct 2010 19:02:10 +0200
Update to new vendor version and remove patch accordingly.
mpg123/mpg123.patch | file | annotate | diff | comparison | revisions | |
mpg123/mpg123.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/mpg123/mpg123.patch Fri Aug 27 15:56:07 2010 +0200 1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 1.3 @@ -1,33 +0,0 @@ 1.4 -Index: src/Makefile.in 1.5 ---- src/Makefile.in.orig 2007-12-05 02:36:29 +0100 1.6 -+++ src/Makefile.in 2007-12-05 08:34:08 +0100 1.7 -@@ -57,7 +57,7 @@ 1.8 - term.$(OBJEXT) wav.$(OBJEXT) xfermem.$(OBJEXT) 1.9 - mpg123_OBJECTS = $(am_mpg123_OBJECTS) 1.10 - am__DEPENDENCIES_1 = 1.11 --DEFAULT_INCLUDES = -I. -I$(srcdir) -I. 1.12 -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_srcdir)/libltdl 1.13 - depcomp = $(SHELL) $(top_srcdir)/build/depcomp 1.14 - am__depfiles_maybe = depfiles 1.15 - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 1.16 -@@ -294,7 +294,7 @@ 1.17 - 1.18 - # AM_CPPFLAGS = 1.19 - mpg123_LDADD = $(LIBLTDL) libmpg123/libmpg123.la @MODULE_OBJ@ @OUTPUT_OBJ@ @OUTPUT_LIBS@ 1.20 --mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ 1.21 -+mpg123_LDFLAGS = @LT_LDFLAGS@ @OUTPUT_LDFLAGS@ -static 1.22 - # Just mpg123_INCLUDES has no effect on build! Trying that before reverting to AM_CPPFLAGS. 1.23 - INCLUDES = $(LTDLINCL) -I$(top_srcdir)/src/libmpg123 1.24 - # libltdl is not mentioned here... it's not that trivial 1.25 -Index: src/output/Makefile.in 1.26 ---- src/output/Makefile.in.orig 2007-12-05 02:36:30 +0100 1.27 -+++ src/output/Makefile.in 2007-12-05 08:33:30 +0100 1.28 -@@ -212,7 +212,7 @@ 1.29 - output_win32_la_OBJECTS = $(am_output_win32_la_OBJECTS) 1.30 - @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@am_output_win32_la_rpath = -rpath \ 1.31 - @HAVE_MODULES_TRUE@@HAVE_WIN32_TRUE@ $(pkglibdir) 1.32 --DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src 1.33 -+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/libltdl 1.34 - depcomp = $(SHELL) $(top_srcdir)/build/depcomp 1.35 - am__depfiles_maybe = depfiles 1.36 - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
2.1 --- a/mpg123/mpg123.spec Fri Aug 27 15:56:07 2010 +0200 2.2 +++ b/mpg123/mpg123.spec Thu Oct 07 19:02:10 2010 +0200 2.3 @@ -31,15 +31,14 @@ 2.4 Class: PLUS 2.5 Group: Audio 2.6 License: GPL 2.7 -Version: 1.6.3 2.8 -Release: 20090106 2.9 +Version: 1.12.3 2.10 +Release: 20100728 2.11 2.12 # package options 2.13 %option with_dev no 2.14 2.15 # list of sources 2.16 Source0: http://www.mpg123.de/download/mpg123-%{version}.tar.bz2 2.17 -Patch0: mpg123.patch 2.18 2.19 # build information 2.20 Prefix: %{l_prefix} 2.21 @@ -61,7 +60,6 @@ 2.22 2.23 %prep 2.24 %setup -q 2.25 - %patch -p0 2.26 2.27 %build 2.28 CC="%{l_cc}" \