Overview
Request 251 (accepted)
- Fix bug reporting link
- BuildRequires nasm only in x86-32 (there is no assembly available
for other archs)
- Stop BuildRequiring flac-devel, it's not used
- Remove autoreconf call and related BuildRequires and patches
- Remove old compatibility Provides
- Stop using configure options that are no longer used
- Run spec-cleaner
- Removed all patches (unneeded)
- Replace some documentation and let the build system install its
own
lame.changes
Changed
-------------------------------------------------------------------
+Thu Jul 19 13:34:07 UTC 2012 - reddwarf@opensuse.org
+
+- Fix bug reporting link
+- BuildRequires nasm only in x86-32 (there is no assembly available
+ for other archs)
+- Stop BuildRequiring flac-devel, it's not used
+- Remove autoreconf call and related BuildRequires and patches
+- Remove old compatibility Provides
+- Stop using configure options that are no longer used
+- Run spec-cleaner
+- Removed all patches (unneeded)
+- Replace some documentation and let the build system install its
+ own
+
+-------------------------------------------------------------------
Tue Jul 17 10:47:48 UTC 2012 - pascal.bleser@opensuse.org
- update to 3.99.5: fixed build on 12.2
lame.spec
Changed
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
%define soname 0
-%if %{suse_version} > 1120
+%if 0%{?suse_version} > 1120
%bcond_with gtk1
%else
%bcond_without gtk1
%endif
-Summary: LAME Ain't an MP3 Encoder
Name: lame
Version: 3.99.5
Release: 999.pm.1
-License: LGPL-2.1+
-URL: http://lame.sourceforge.net/
+Summary: LAME Ain't an MP3 Encoder
+License: LGPL-2.0+
Group: Productivity/Multimedia/Sound/Editors and Convertors
+Url: http://lame.sourceforge.net/
Source: http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
-Patch5: lame-tgetstr.patch
-Source99: lame-rpmlintrc
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: gcc glibc-devel make pkgconfig ncurses-devel nasm
-BuildRequires: flac-devel
-# BuildRequires: libsndfile-devel
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
+BuildRequires: ncurses-devel
+BuildRequires: pkgconfig
%if %{with gtk1}
BuildRequires: gtk-devel
%endif
-BuildRequires: autoconf automake libtool
-Requires: libmp3lame%{soname} = %{version}
+Requires: libmp3lame%{soname} >= %{version}
%description
LAME is an educational tool to be used for learning about MP3 encoding.
a patent free audio compression codec for the GNU project.
This package contains additional documentation files in
- %{_docdir}/%{name}/
+ %{_defaultdocdir}/%{name}/
%package -n libmp3lame%{soname}
Summary: LAME Ain't an MP3 Encoder
Group: System/Libraries
-Provides: liblame = %{version}-%{release}
-Provides: libmp3lame = %{version}-%{release}
%description -n libmp3lame%{soname}
LAME is an educational tool to be used for learning about MP3 encoding.
Summary: LAME Ain't an MP3 Encoder
Group: Development/Libraries/C and C++
Requires: libmp3lame%{soname} = %{version}
-Provides: liblame-devel = %{version}
%description -n libmp3lame-devel
LAME is an educational tool to be used for learning about MP3 encoding.
%package -n lame-mp3rtp
Summary: MP3 Encoder for RTP Streaming
Group: Productivity/Multimedia/Sound/Editors and Convertors
-Requires: libmp3lame%{soname} = %{version}
-Provides: mp3rtp = %{version}
+Requires: libmp3lame%{soname} >= %{version}
%description -n lame-mp3rtp
LAME is an educational tool to be used for learning about MP3 encoding.
%package -n lame-mp3x
Summary: MP3 Frame Analyzer
Group: Productivity/Multimedia/Sound/Visualization
-Requires: libmp3lame%{soname} = %{version}
-Provides: mp3x = %{version}
+Requires: libmp3lame%{soname} >= %{version}
%description -n lame-mp3x
LAME is an educational tool to be used for learning about MP3 encoding.
%prep
%setup -q
-%patch5
-
-%if 0%{?suse_version} > 1210
-find . -type f \( -name configure.in -o -name Makefile.am \) | while read f; do
- perl -n -i.orig -e 's/\s+\S*ansi2knr// if /^AUTOMAKE_OPTIONS/ ; print unless /^AM_C_PROTOTYPES/' "$f"
-done
-%endif
-
-%if !%{with gtk1}
-# dirty
-sed -i -e 's/AM_PATH_GTK.*/HAVE_GTK=no/' configure.in
-sed -i -e s/@GTK_CFLAGS@// frontend/Makefile.am
-%endif
%build
-autoreconf -fiv
-
-LIBS="-lm" \
-CFLAGS="%{optflags}" \
-%configure \
- --enable-nasm \
- --enable-decoder \
- --without-vorbis \
- --enable-analyzer=no \
- --enable-brhist \
- --disable-debug \
- --enable-mp3rtp \
-%if %{with gtk1}
- --enable-mp3x \
-%endif
- --with-fileio=lame \
- --enable-dynamic-frontends \
- --disable-rpath \
- --disable-static
-
-%__make %{?_smp_flags}
+%configure --disable-static \
+ --enable-dynamic-frontends \
+ --enable-mp3rtp \
+%{?with_gtk1:--enable-mp3x} \
+ --enable-nasm
+make %{?_smp_flags} pkgdocdir=%{_defaultdocdir}/%{name}/
%install
-%makeinstall
-rm -rf "%{buildroot}%{_datadir}/doc"
+%make_install pkgdocdir=%{_defaultdocdir}/%{name}/
rm -f %{buildroot}%{_libdir}/libmp3lame.la
-%__install -d "%{buildroot}%{_docdir}/%{name}"
-DOC_MAIN="$PWD/lame.main.doc.lst"
-DOC_DOC="$PWD/lame.doc.doc.lst"
-echo -n >"$DOC_MAIN"
-echo -n >"$DOC_DOC"
-for f in LICENSE COPYING; do
- echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_MAIN"
- %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/"
-done
-for f in USAGE API TODO README* HACKING ChangeLog; do
- echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_DOC"
- %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/"
+for f in ChangeLog README TODO USAGE; do
+ install -m0644 "$f" "%{buildroot}%{_defaultdocdir}/%{name}/"
done
%post -n libmp3lame%{soname} -p /sbin/ldconfig
%postun -n libmp3lame%{soname} -p /sbin/ldconfig
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
-%files -f lame.main.doc.lst
+%files
%defattr(-,root,root)
-%doc %dir %{_docdir}/%{name}
%{_bindir}/lame
-%doc %{_mandir}/man1/lame.1%{ext_man}
+%{_mandir}/man1/lame.1*
-%files doc -f lame.doc.doc.lst
+%files doc
%defattr(-,root,root)
-%doc %dir %{_docdir}/%{name}
+%{_defaultdocdir}/%{name}
%files -n libmp3lame%{soname}
-%defattr(-,root,root)
+%defattr(0644,root,root,0755)
+%doc COPYING LICENSE
%{_libdir}/libmp3lame.so.%{soname}
%{_libdir}/libmp3lame.so.%{soname}.*
%files -n libmp3lame-devel
%defattr(-,root,root)
-%{_includedir}/lame
+%doc API HACKING STYLEGUIDE
+%{_includedir}/lame/
%{_libdir}/libmp3lame.so
%files -n lame-mp3rtp
lame-3.98-shared-frontend.patch
Deleted
-diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am
---- lame-398.old/frontend/Makefile.am 2006-09-30 11:17:05.000000000 +0200
-+++ lame-398.new/frontend/Makefile.am 2008-07-06 12:36:25.000000000 +0200
-@@ -52,7 +52,7 @@
- endif
-
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
-
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
-
-diff -ur lame-398.old/frontend/Makefile.in lame-398.new/frontend/Makefile.in
---- lame-398.old/frontend/Makefile.in 2008-06-25 14:17:51.000000000 +0200
-+++ lame-398.new/frontend/Makefile.in 2008-07-06 12:36:39.000000000 +0200
-@@ -152,7 +152,7 @@
- $(top_builddir)/libmp3lame/libmp3lame.la \
- @FRONTEND_LDADD@
-
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
lame-3.98.2-get_audio.patch
Deleted
-Read and write from std* when sndfile is used
-
---- frontend/get_audio.c
-+++ frontend/get_audio.c
-@@ -605,12 +605,17 @@
- }
- #endif
- #ifdef HAVE_MPGLIB
-- if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
-+ if (!strcmp(lpszFileName, "-")) {
-+ lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */
-+ }
-+ else {
-+ if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
- if (silent < 10) {
-- error_printf("Could not find \"%s\".\n", lpszFileName);
-+ error_printf("Could not find \"%s\".\n", lpszFileName);
- }
- exit(1);
-- }
-+ }
-+ }
- if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) {
- if (silent < 10) {
- error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
lame-fix_automake.patch
Deleted
---- aclocal.m4.orig 2012-07-17 12:38:35.061914413 +0200
-+++ aclocal.m4 2012-07-17 12:38:56.168913661 +0200
-@@ -10530,22 +10530,6 @@
-
- # serial 5
-
--AC_DEFUN(AM_C_PROTOTYPES,
--AC_REQUIRE(AC_C_PROTOTYPES)
--if test "$ac_cv_prog_cc_stdc" != no; then
-- U= ANSI2KNR=
--else
-- U=_ ANSI2KNR=./ansi2knr
--fi
--# Ensure some checks needed by ansi2knr itself.
--AC_REQUIRE(AC_HEADER_STDC)
--AC_CHECK_HEADERS(string.h)
--AC_SUBST(U)dnl
--AC_SUBST(ANSI2KNR)dnl
--_AM_SUBST_NOTMAKE(ANSI2KNR)dnl
--)
--
--AU_DEFUN(fp_C_PROTOTYPES, AM_C_PROTOTYPES)
-
- # Check to make sure that the build environment is sane. -*- Autoconf -*-
-
lame-tgetstr.patch
Deleted
---- configure.in.orig 2012-07-17 12:27:45.026937540 +0200
-+++ configure.in 2012-07-17 12:28:32.162935863 +0200
-@@ -373,8 +373,11 @@
- AC_CHECK_HEADERS(termcap.h)
- AC_CHECK_HEADERS(ncurses/termcap.h)
- AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
--AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
--AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
-+AC_CHECK_LIB(ncursesw, initscr, HAVE_TERMCAP="ncursesw")
-+AC_CHECK_LIB(ncursesw, tgetstr)
-+AC_CHECK_LIB(termcap, tgetstr)
-+AC_CHECK_LIB(tinfo, tgetstr)
-+
-
- AM_ICONV
-
Request History
RedDwarf created request over 11 years ago
- Fix bug reporting link
- BuildRequires nasm only in x86-32 (there is no assembly available
for other archs)
- Stop BuildRequiring flac-devel, it's not used
- Remove autoreconf call and related BuildRequires and patches
- Remove old compatibility Provides
- Stop using configure options that are no longer used
- Run spec-cleaner
- Removed all patches (unneeded)
- Replace some documentation and let the build system install its
own
pbleser accepted request over 12 years ago
ok