10:33 p.m.
Author: rathann
Update of /cvs/free/rpms/lame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27196/F-9
Modified Files:
.cvsignore lame-noexecstack.patch lame.spec sources
Added Files:
lame-pmake.patch
Removed Files:
lame-as-needed.patch
Log Message:
* Mon Oct 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 3.98.2-2
- update to 3.98.2
- preserve file timestamps
- drop obsolete patch
- no need to call autoreconf anymore
- fix parallel make builds
lame-pmake.patch:
--- NEW FILE lame-pmake.patch ---
diff -up lame-398-2/libmp3lame/i386/Makefile.in.pmake
lame-398-2/libmp3lame/i386/Makefile.in
--- lame-398-2/libmp3lame/i386/Makefile.in.pmake 2008-10-20 23:14:56.000000000 +0200
+++ lame-398-2/libmp3lame/i386/Makefile.in 2008-10-20 23:15:18.000000000 +0200
@@ -482,7 +482,7 @@ uninstall-am:
$(NASM) $(NASMFLAGS) $< -o $@ -l $@.lst
.nas.lo: $< nasm.h
- test -d .libs || mkdir .libs
+ mkdir -p .libs
$(ECHO) '# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18
22:14:06)' >$@
$(ECHO) "pic_object='.libs/$*.o'" >>$@
$(ECHO) "non_pic_object='$*.o'" >>$@
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Aug 2008 17:32:32 -0000 1.2
+++ .cvsignore 20 Oct 2008 22:33:44 -0000 1.3
@@ -1 +1 @@
-lame-3.97.tar.gz
+lame-398-2.tar.gz
lame-noexecstack.patch:
Index: lame-noexecstack.patch
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/lame-noexecstack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lame-noexecstack.patch 3 Aug 2008 17:32:32 -0000 1.1
+++ lame-noexecstack.patch 20 Oct 2008 22:33:44 -0000 1.2
@@ -1,7 +1,7 @@
-diff -ur lame-3.97.orig/libmp3lame/i386/choose_table.nas
lame-3.97/libmp3lame/i386/choose_table.nas
---- lame-3.97.orig/libmp3lame/i386/choose_table.nas 2000-10-27 13:19:05.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/choose_table.nas 2007-02-15 09:14:07.000000000 +0100
-@@ -431,3 +431,7 @@
+diff -up lame-398-2/libmp3lame/i386/choose_table.nas.noexec
lame-398-2/libmp3lame/i386/choose_table.nas
+--- lame-398-2/libmp3lame/i386/choose_table.nas.noexec 2008-08-31 14:28:37.000000000
+0200
++++ lame-398-2/libmp3lame/i386/choose_table.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -445,3 +445,7 @@ from2:
ret
end
@@ -9,10 +9,10 @@
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/cpu_feat.nas
lame-3.97/libmp3lame/i386/cpu_feat.nas
---- lame-3.97.orig/libmp3lame/i386/cpu_feat.nas 2003-11-10 16:41:00.000000000 +0100
-+++ lame-3.97/libmp3lame/i386/cpu_feat.nas 2007-02-15 09:13:58.000000000 +0100
-@@ -105,3 +105,7 @@
+diff -up lame-398-2/libmp3lame/i386/cpu_feat.nas.noexec
lame-398-2/libmp3lame/i386/cpu_feat.nas
+--- lame-398-2/libmp3lame/i386/cpu_feat.nas.noexec 2003-11-10 16:41:00.000000000 +0100
++++ lame-398-2/libmp3lame/i386/cpu_feat.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -105,3 +105,7 @@ return0:
ret
end
@@ -20,32 +20,21 @@
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/fft.nas lame-3.97/libmp3lame/i386/fft.nas
---- lame-3.97.orig/libmp3lame/i386/fft.nas 2000-10-04 14:13:26.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/fft.nas 2007-02-15 09:14:34.000000000 +0100
-@@ -265,3 +265,7 @@
- pop esi
- pop ebx
- ret
-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/fft3dn.nas lame-3.97/libmp3lame/i386/fft3dn.nas
---- lame-3.97.orig/libmp3lame/i386/fft3dn.nas 2006-09-24 15:53:33.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/fft3dn.nas 2007-02-15 09:14:18.000000000 +0100
-@@ -275,3 +275,7 @@
- add esp,16
+diff -up lame-398-2/libmp3lame/i386/fft3dn.nas.noexec
lame-398-2/libmp3lame/i386/fft3dn.nas
+--- lame-398-2/libmp3lame/i386/fft3dn.nas.noexec 2008-08-31 14:28:37.000000000 +0200
++++ lame-398-2/libmp3lame/i386/fft3dn.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -486,3 +486,7 @@ proc fht_E3DN
+ add esp,20
popd ebp, ebx, esi, edi
endproc
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/fftfpu.nas lame-3.97/libmp3lame/i386/fftfpu.nas
---- lame-3.97.orig/libmp3lame/i386/fftfpu.nas 2000-10-04 14:13:26.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/fftfpu.nas 2007-02-15 09:14:35.000000000 +0100
-@@ -617,3 +617,7 @@
+diff -up lame-398-2/libmp3lame/i386/fftfpu.nas.noexec
lame-398-2/libmp3lame/i386/fftfpu.nas
+--- lame-398-2/libmp3lame/i386/fftfpu.nas.noexec 2000-10-04 14:13:26.000000000 +0200
++++ lame-398-2/libmp3lame/i386/fftfpu.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -617,3 +617,7 @@ fht_FPU_FXCH_3rd_part:
endproc
end
@@ -53,21 +42,32 @@
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/fftsse.nas lame-3.97/libmp3lame/i386/fftsse.nas
---- lame-3.97.orig/libmp3lame/i386/fftsse.nas 2000-10-04 14:13:26.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/fftsse.nas 2007-02-15 09:14:36.000000000 +0100
-@@ -536,3 +536,7 @@
-
+diff -up lame-398-2/libmp3lame/i386/fft.nas.noexec lame-398-2/libmp3lame/i386/fft.nas
+--- lame-398-2/libmp3lame/i386/fft.nas.noexec 2000-10-04 14:13:26.000000000 +0200
++++ lame-398-2/libmp3lame/i386/fft.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -265,3 +265,7 @@ fht_3DN:
+ pop esi
+ pop ebx
+ ret
++
++%ifidn __OUTPUT_FORMAT__,elf
++section .note.GNU-stack noalloc noexec nowrite progbits
++%endif
+diff -up lame-398-2/libmp3lame/i386/fftsse.nas.noexec
lame-398-2/libmp3lame/i386/fftsse.nas
+--- lame-398-2/libmp3lame/i386/fftsse.nas.noexec 2008-08-31 14:28:37.000000000 +0200
++++ lame-398-2/libmp3lame/i386/fftsse.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -420,3 +420,7 @@ fht_SSE:
+ ret
end
+
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
-diff -ur lame-3.97.orig/libmp3lame/i386/ffttbl.nas lame-3.97/libmp3lame/i386/ffttbl.nas
---- lame-3.97.orig/libmp3lame/i386/ffttbl.nas 2000-10-04 14:13:26.000000000 +0200
-+++ lame-3.97/libmp3lame/i386/ffttbl.nas 2007-02-15 09:14:38.000000000 +0100
-@@ -76,3 +76,7 @@
+diff -up lame-398-2/libmp3lame/i386/ffttbl.nas.noexec
lame-398-2/libmp3lame/i386/ffttbl.nas
+--- lame-398-2/libmp3lame/i386/ffttbl.nas.noexec 2000-10-04 14:13:26.000000000 +0200
++++ lame-398-2/libmp3lame/i386/ffttbl.nas 2008-10-20 22:34:23.000000000 +0200
+@@ -76,3 +76,7 @@ gray_index:
segment_code
end
Index: lame.spec
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/lame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lame.spec 3 Aug 2008 17:32:32 -0000 1.1
+++ lame.spec 20 Oct 2008 22:33:44 -0000 1.2
@@ -1,19 +1,18 @@
+%define fver 398-2
+
Name: lame
-Version: 3.97
-Release: 7%{?dist}
+Version: 3.98.2
+Release: 2%{?dist}
Summary: Free MP3 audio compressor
Group: Applications/Multimedia
License: GPLv2+
URL: http://lame.sourceforge.net/
-Source0: http://downloads.sourceforge.net/lame/%{name}-%{version}.tar.gz
-Patch0: %{name}-as-needed.patch
+Source0: http://downloads.sourceforge.net/sourceforge/lame/%{name}-%{fver}.tar.gz
Patch1: %{name}-noexecstack.patch
+Patch2: %{name}-pmake.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: gtk+-devel
# pkg-config should be pulled in by gtk+-devel but is not in EL-5
@@ -55,14 +54,13 @@
%prep
-%setup -q
-%patch0 -p1 -b .as-needed
+%setup -q -n %{name}-%{fver}
%patch1 -p1 -b .noexec
-iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && mv ChangeLog.tmp
ChangeLog
+%patch2 -p1 -b .pmake
+iconv -f ISO-8859-1 -t UTF8 ChangeLog > ChangeLog.tmp && touch -r ChangeLog
ChangeLog.tmp && mv ChangeLog.tmp ChangeLog
%build
-autoreconf
sed -i -e 's/^\(\s*hardcode_libdir_flag_spec\s*=\).*/\1/' configure
%ifarch %{ix86}
export CFLAGS="$RPM_OPT_FLAGS -ffast-math"
@@ -82,7 +80,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
# Some apps still expect to find <lame.h>
ln -sf lame/lame.h $RPM_BUILD_ROOT%{_includedir}/lame.h
@@ -126,6 +124,13 @@
%{_bindir}/mp3x
%changelog
+* Mon Oct 20 2008 Dominik Mierzejewski <rpm at greysector.net> - 3.98.2-2
+- update to 3.98.2
+- preserve file timestamps
+- drop obsolete patch
+- no need to call autoreconf anymore
+- fix parallel make builds
+
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 3.97-7
- rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lame/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Aug 2008 17:32:32 -0000 1.2
+++ sources 20 Oct 2008 22:33:44 -0000 1.3
@@ -1 +1 @@
-90a4acbb730d150dfe80de145126eef7 lame-3.97.tar.gz
+719dae0ee675d0c16e0e89952930ed35 lame-398-2.tar.gz
--- lame-as-needed.patch DELETED ---