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

Submit package home:RedDwarf:branches:Essentials / lame to package Essentials / lame

lame.changes Changed
x
 
1
@@ -1,4 +1,19 @@
2
 -------------------------------------------------------------------
3
+Thu Jul 19 13:34:07 UTC 2012 - reddwarf@opensuse.org
4
+
5
+- Fix bug reporting link
6
+- BuildRequires nasm only in x86-32 (there is no assembly available
7
+  for other archs)
8
+- Stop BuildRequiring flac-devel, it's not used
9
+- Remove autoreconf call and related BuildRequires and patches
10
+- Remove old compatibility Provides
11
+- Stop using configure options that are no longer used
12
+- Run spec-cleaner
13
+- Removed all patches (unneeded)
14
+- Replace some documentation and let the build system install its
15
+  own
16
+
17
+-------------------------------------------------------------------
18
 Tue Jul 17 10:47:48 UTC 2012 - pascal.bleser@opensuse.org
19
 
20
 - update to 3.99.5: fixed build on 12.2
21
lame.spec Changed
195
 
1
@@ -11,35 +11,33 @@
2
 # license that conforms to the Open Source Definition (Version 1.9)
3
 # published by the Open Source Initiative.
4
 
5
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
6
+# Please submit bugfixes or comments via http://bugs.links2linux.org/
7
 
8
 %define soname 0
9
 
10
-%if %{suse_version} > 1120
11
+%if 0%{?suse_version} > 1120
12
 %bcond_with gtk1
13
 %else
14
 %bcond_without gtk1
15
 %endif
16
 
17
-Summary:        LAME Ain't an MP3 Encoder
18
 Name:           lame
19
 Version:        3.99.5
20
 Release:        999.pm.1
21
-License:        LGPL-2.1+
22
-URL:            http://lame.sourceforge.net/
23
+Summary:        LAME Ain't an MP3 Encoder
24
+License:        LGPL-2.0+
25
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
26
+Url:            http://lame.sourceforge.net/
27
 Source:         http://prdownloads.sourceforge.net/lame/lame-%{version}.tar.gz
28
-Patch5:         lame-tgetstr.patch
29
-Source99:       lame-rpmlintrc
30
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
31
-BuildRequires:  gcc glibc-devel make pkgconfig ncurses-devel nasm
32
-BuildRequires:  flac-devel
33
-# BuildRequires:  libsndfile-devel
34
+%ifarch %{ix86}
35
+BuildRequires:  nasm
36
+%endif
37
+BuildRequires:  ncurses-devel
38
+BuildRequires:  pkgconfig
39
 %if %{with gtk1}
40
 BuildRequires:  gtk-devel
41
 %endif
42
-BuildRequires:  autoconf automake libtool
43
-Requires:       libmp3lame%{soname} = %{version}
44
+Requires:       libmp3lame%{soname} >= %{version}
45
 
46
 %description
47
 LAME is an educational tool to be used for learning about MP3 encoding.
48
@@ -61,13 +59,11 @@
49
 a patent free audio compression codec for the GNU project.
50
 
51
 This package contains additional documentation files in
52
-  %{_docdir}/%{name}/
53
+  %{_defaultdocdir}/%{name}/
54
 
55
 %package -n libmp3lame%{soname}
56
 Summary:        LAME Ain't an MP3 Encoder
57
 Group:          System/Libraries
58
-Provides:       liblame = %{version}-%{release}
59
-Provides:       libmp3lame = %{version}-%{release}
60
 
61
 %description -n libmp3lame%{soname}
62
 LAME is an educational tool to be used for learning about MP3 encoding.
63
@@ -80,7 +76,6 @@
64
 Summary:        LAME Ain't an MP3 Encoder
65
 Group:          Development/Libraries/C and C++
66
 Requires:       libmp3lame%{soname} = %{version}
67
-Provides:       liblame-devel = %{version}
68
 
69
 %description -n libmp3lame-devel
70
 LAME is an educational tool to be used for learning about MP3 encoding.
71
@@ -92,8 +87,7 @@
72
 %package -n lame-mp3rtp
73
 Summary:        MP3 Encoder for RTP Streaming
74
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
75
-Requires:       libmp3lame%{soname} = %{version}
76
-Provides:       mp3rtp = %{version}
77
+Requires:       libmp3lame%{soname} >= %{version}
78
 
79
 %description -n lame-mp3rtp
80
 LAME is an educational tool to be used for learning about MP3 encoding.
81
@@ -108,8 +102,7 @@
82
 %package -n lame-mp3x
83
 Summary:        MP3 Frame Analyzer
84
 Group:          Productivity/Multimedia/Sound/Visualization
85
-Requires:       libmp3lame%{soname} = %{version}
86
-Provides:       mp3x = %{version}
87
+Requires:       libmp3lame%{soname} >= %{version}
88
 
89
 %description -n lame-mp3x
90
 LAME is an educational tool to be used for learning about MP3 encoding.
91
@@ -124,86 +117,45 @@
92
 
93
 %prep
94
 %setup -q
95
-%patch5
96
-
97
-%if 0%{?suse_version} > 1210
98
-find . -type f \( -name configure.in -o -name Makefile.am \) | while read f; do
99
-    perl -n -i.orig -e 's/\s+\S*ansi2knr// if /^AUTOMAKE_OPTIONS/ ; print unless /^AM_C_PROTOTYPES/' "$f"
100
-done
101
-%endif
102
-
103
-%if !%{with gtk1}
104
-# dirty
105
-sed -i -e 's/AM_PATH_GTK.*/HAVE_GTK=no/' configure.in
106
-sed -i -e s/@GTK_CFLAGS@// frontend/Makefile.am
107
-%endif
108
 
109
 %build
110
-autoreconf -fiv
111
-
112
-LIBS="-lm" \
113
-CFLAGS="%{optflags}" \
114
-%configure \
115
-    --enable-nasm \
116
-    --enable-decoder \
117
-    --without-vorbis \
118
-    --enable-analyzer=no \
119
-    --enable-brhist \
120
-    --disable-debug \
121
-    --enable-mp3rtp \
122
-%if %{with gtk1}
123
-    --enable-mp3x \
124
-%endif
125
-    --with-fileio=lame \
126
-    --enable-dynamic-frontends \
127
-    --disable-rpath \
128
-    --disable-static
129
- 
130
-%__make %{?_smp_flags}
131
+%configure --disable-static \
132
+           --enable-dynamic-frontends \
133
+           --enable-mp3rtp \
134
+%{?with_gtk1:--enable-mp3x} \
135
+           --enable-nasm
136
+make %{?_smp_flags} pkgdocdir=%{_defaultdocdir}/%{name}/
137
 
138
 %install
139
-%makeinstall
140
-rm -rf "%{buildroot}%{_datadir}/doc"
141
+%make_install pkgdocdir=%{_defaultdocdir}/%{name}/
142
 rm -f %{buildroot}%{_libdir}/libmp3lame.la
143
 
144
-%__install -d "%{buildroot}%{_docdir}/%{name}"
145
-DOC_MAIN="$PWD/lame.main.doc.lst"
146
-DOC_DOC="$PWD/lame.doc.doc.lst"
147
-echo -n >"$DOC_MAIN"
148
-echo -n >"$DOC_DOC"
149
-for f in LICENSE COPYING; do
150
-    echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_MAIN"
151
-    %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/"
152
-done
153
-for f in USAGE API TODO README* HACKING ChangeLog; do
154
-    echo "%doc %{_docdir}/%{name}/$f" >>"$DOC_DOC"
155
-    %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/"
156
+for f in ChangeLog README TODO USAGE; do
157
+    install -m0644 "$f" "%{buildroot}%{_defaultdocdir}/%{name}/"
158
 done
159
 
160
 %post   -n libmp3lame%{soname} -p /sbin/ldconfig
161
 %postun -n libmp3lame%{soname} -p /sbin/ldconfig
162
 
163
-%clean
164
-%{?buildroot:%__rm -rf "%{buildroot}"}
165
-
166
-%files -f lame.main.doc.lst
167
+%files
168
 %defattr(-,root,root)
169
-%doc %dir %{_docdir}/%{name}
170
 %{_bindir}/lame
171
-%doc %{_mandir}/man1/lame.1%{ext_man}
172
+%{_mandir}/man1/lame.1*
173
 
174
-%files doc -f lame.doc.doc.lst
175
+%files doc
176
 %defattr(-,root,root)
177
-%doc %dir %{_docdir}/%{name}
178
+%{_defaultdocdir}/%{name}
179
 
180
 %files -n libmp3lame%{soname}
181
-%defattr(-,root,root)
182
+%defattr(0644,root,root,0755)
183
+%doc COPYING LICENSE
184
 %{_libdir}/libmp3lame.so.%{soname}
185
 %{_libdir}/libmp3lame.so.%{soname}.*
186
 
187
 %files -n libmp3lame-devel
188
 %defattr(-,root,root)
189
-%{_includedir}/lame
190
+%doc API HACKING STYLEGUIDE
191
+%{_includedir}/lame/
192
 %{_libdir}/libmp3lame.so
193
 
194
 %files -n lame-mp3rtp
195
lame-3.98-shared-frontend.patch Deleted
26
 
1
@@ -1,24 +0,0 @@
2
-diff -ur lame-398.old/frontend/Makefile.am lame-398.new/frontend/Makefile.am
3
---- lame-398.old/frontend/Makefile.am  2006-09-30 11:17:05.000000000 +0200
4
-+++ lame-398.new/frontend/Makefile.am  2008-07-06 12:36:25.000000000 +0200
5
-@@ -52,7 +52,7 @@
6
- endif
7
- 
8
- CFLAGS = @CFLAGS@ @GTK_CFLAGS@ @FRONTEND_CFLAGS@ @SNDFILE_CFLAGS@
9
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
10
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
11
- 
12
- INCLUDES = -I$(top_srcdir)/libmp3lame -I$(top_srcdir)/include -I$(top_builddir)
13
- 
14
-diff -ur lame-398.old/frontend/Makefile.in lame-398.new/frontend/Makefile.in
15
---- lame-398.old/frontend/Makefile.in  2008-06-25 14:17:51.000000000 +0200
16
-+++ lame-398.new/frontend/Makefile.in  2008-07-06 12:36:39.000000000 +0200
17
-@@ -152,7 +152,7 @@
18
-   $(top_builddir)/libmp3lame/libmp3lame.la \
19
-   @FRONTEND_LDADD@
20
- 
21
--LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@ -static
22
-+LDFLAGS = @LDFLAGS@ @FRONTEND_LDFLAGS@ @SNDFILE_LIBS@
23
- LIBOBJS = @LIBOBJS@
24
- LIBS = @LIBS@
25
- LIBTOOL = @LIBTOOL@
26
lame-3.98.2-get_audio.patch Deleted
27
 
1
@@ -1,25 +0,0 @@
2
-Read and write from std* when sndfile is used
3
-
4
---- frontend/get_audio.c
5
-+++ frontend/get_audio.c
6
-@@ -605,12 +605,17 @@
7
-         }
8
- #endif
9
- #ifdef HAVE_MPGLIB
10
--        if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
11
-+       if (!strcmp(lpszFileName, "-")) {
12
-+         lame_set_stream_binary_mode(musicin = stdin); /* Read from standard input. */
13
-+       }
14
-+       else {
15
-+         if ((musicin = fopen(lpszFileName, "rb")) == NULL) {
16
-             if (silent < 10) {
17
--                error_printf("Could not find \"%s\".\n", lpszFileName);
18
-+             error_printf("Could not find \"%s\".\n", lpszFileName);
19
-             }
20
-             exit(1);
21
--        }
22
-+         }
23
-+       }
24
-         if (-1 == lame_decode_initfile(musicin, &mp3input_data, enc_delay, enc_padding)) {
25
-             if (silent < 10) {
26
-                 error_printf("Error reading headers in mp3 input file %s.\n", lpszFileName);
27
lame-fix_automake.patch Deleted
27
 
1
@@ -1,25 +0,0 @@
2
---- aclocal.m4.orig    2012-07-17 12:38:35.061914413 +0200
3
-+++ aclocal.m4 2012-07-17 12:38:56.168913661 +0200
4
-@@ -10530,22 +10530,6 @@
5
- 
6
- # serial 5
7
- 
8
--AC_DEFUN(AM_C_PROTOTYPES,
9
--AC_REQUIRE(AC_C_PROTOTYPES)
10
--if test "$ac_cv_prog_cc_stdc" != no; then
11
--  U= ANSI2KNR=
12
--else
13
--  U=_ ANSI2KNR=./ansi2knr
14
--fi
15
--# Ensure some checks needed by ansi2knr itself.
16
--AC_REQUIRE(AC_HEADER_STDC)
17
--AC_CHECK_HEADERS(string.h)
18
--AC_SUBST(U)dnl
19
--AC_SUBST(ANSI2KNR)dnl
20
--_AM_SUBST_NOTMAKE(ANSI2KNR)dnl
21
--)
22
--
23
--AU_DEFUN(fp_C_PROTOTYPES, AM_C_PROTOTYPES)
24
- 
25
- # Check to make sure that the build environment is sane.    -*- Autoconf -*-
26
- 
27
lame-tgetstr.patch Deleted
18
 
1
@@ -1,16 +0,0 @@
2
---- configure.in.orig  2012-07-17 12:27:45.026937540 +0200
3
-+++ configure.in   2012-07-17 12:28:32.162935863 +0200
4
-@@ -373,8 +373,11 @@
5
- AC_CHECK_HEADERS(termcap.h)
6
- AC_CHECK_HEADERS(ncurses/termcap.h)
7
- AC_CHECK_LIB(termcap, initscr, HAVE_TERMCAP="termcap")
8
--AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses")
9
--AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses")
10
-+AC_CHECK_LIB(ncursesw, initscr, HAVE_TERMCAP="ncursesw")
11
-+AC_CHECK_LIB(ncursesw, tgetstr)
12
-+AC_CHECK_LIB(termcap, tgetstr)
13
-+AC_CHECK_LIB(tinfo, tgetstr)
14
-+
15
- 
16
- AM_ICONV
17
-  
18
Refresh
Refresh
Request History
Cristian Morales Vega's avatar

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's avatar

pbleser accepted request over 12 years ago

ok