OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Dec-2007 08:35:39
Branch: HEAD Handle: 2007120507353900
Added files:
openpkg-src/mpg123 mpg123.patch
Modified files:
openpkg-src/mpg123 mpg123.spec
Log:
upgrading package: mpg123 0.68 -> 1.0rc1
Summary:
Revision Changes Path
1.10 +33 -0 openpkg-src/mpg123/mpg123.patch
1.54 +12 -10 openpkg-src/mpg123/mpg123.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mpg123/mpg123.patch
============================================================================
$ cvs diff -u -r0 -r1.10 mpg123.patch
--- /dev/null 2007-12-05 08:33:01 +0100
+++ mpg123.patch 2007-12-05 08:35:39 +0100
@@ -0,0 +1,33 @@
+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@@[EMAIL PROTECTED] = -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) \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mpg123/mpg123.spec
============================================================================
$ cvs diff -u -r1.53 -r1.54 mpg123.spec
--- openpkg-src/mpg123/mpg123.spec 5 Nov 2007 06:48:00 -0000 1.53
+++ openpkg-src/mpg123/mpg123.spec 5 Dec 2007 07:35:39 -0000 1.54
@@ -32,11 +32,12 @@
Class: PLUS
Group: Audio
License: GPL
-Version: 0.68
-Release: 20071105
+Version: 1.0rc1
+Release: 20071205
# list of sources
Source0: http://www.mpg123.de/download/mpg123-%{version}.tar.bz2
+Patch0: mpg123.patch
# build information
Prefix: %{l_prefix}
@@ -58,23 +59,24 @@
%prep
%setup -q
+ %patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
- --prefix=%{l_prefix}
+ --prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
+ --enable-static \
+ --enable-shared
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/bin \
- $RPM_BUILD_ROOT%{l_prefix}/man/man1
- %{l_shtool} install -c -s -m 755 \
- src/mpg123 $RPM_BUILD_ROOT%{l_prefix}/bin/
- %{l_shtool} install -c -m 644 \
- man1/mpg123.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
+ %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libmpg123.so*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libmpg123.la
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/mpg123/*.a
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
