From 0ae5e232ba692234d1cd186b452a74aad5f791df Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 17:18:52 +0000 Subject: [PATCH] import UBI lame-3.100-19.el10 --- .gitignore | 3 +- add-dwarf-debug.patch | 24 ------------- gating.yaml | 6 ---- lame.spec | 78 ++++++++++++++++++++++++++++++------------- 4 files changed, 56 insertions(+), 55 deletions(-) delete mode 100644 add-dwarf-debug.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index 4fed9be..377c061 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -SOURCES/lame-3.100.tar.gz -/lame-3.100.tar.gz +lame-3.100.tar.gz diff --git a/add-dwarf-debug.patch b/add-dwarf-debug.patch deleted file mode 100644 index 6b4d470..0000000 --- a/add-dwarf-debug.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru lame-3.100/configure lame-3.100.new/configure ---- lame-3.100/configure 2017-08-15 17:17:12.000000000 +0200 -+++ lame-3.100.new/configure 2018-10-09 11:19:37.573591392 +0200 -@@ -17359,7 +17359,7 @@ - ;; - *) - CYGWIN=no -- NASM_FORMAT="-f elf" -+ NASM_FORMAT="-f elf -gdwarf" - ;; - esac - -diff -ru lame-3.100/configure.in lame-3.100.new/configure.in ---- lame-3.100/configure.in 2017-08-15 17:16:31.000000000 +0200 -+++ lame-3.100.new/configure.in 2018-10-09 11:20:48.290147258 +0200 -@@ -766,7 +766,7 @@ - ;; - *) - CYGWIN=no -- NASM_FORMAT="-f elf" -+ NASM_FORMAT="-f elf -gdwarf" - ;; - esac - diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index ea86f9d..0000000 --- a/gating.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} diff --git a/lame.spec b/lame.spec index 858aea1..83bcff7 100644 --- a/lame.spec +++ b/lame.spec @@ -1,16 +1,15 @@ Name: lame Version: 3.100 -Release: 6%{?dist} +Release: 19%{?dist} Summary: Free MP3 audio compressor - -Group: Applications/Multimedia -License: GPLv2+ +License: LGPL-2.0-or-later AND LGPL-2.1-or-later URL: http://lame.sourceforge.net/ -Source0: http://downloads.sourceforge.net/sourceforge/lame/%{name}-%{version}.tar.gz +Source0: https://downloads.sourceforge.net/sourceforge/lame/%{name}-%{version}.tar.gz Patch1: %{name}-noexecstack.patch Patch2: libmp3lame-symbols.patch -Patch3: add-dwarf-debug.patch +BuildRequires: gcc +BuildRequires: make BuildRequires: ncurses-devel %ifarch %{ix86} BuildRequires: nasm @@ -19,24 +18,23 @@ Requires: %{name}-libs = %{version}-%{release} %description LAME is an open source MP3 encoder whose quality and speed matches -commercial encoders. LAME handles MPEG1,2 and 2.5 layer III encoding +commercial encoders. LAME handles MPEG-1, 2 and 2.5 layer III encoding with both constant and variable bitrates. %package libs Summary: LAME MP3 encoding library -Group: System Environment/Libraries %description libs LAME MP3 encoding library. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %description devel This package development files for %{name}. + %prep %autosetup -p1 @@ -54,7 +52,6 @@ export ac_cv_header_xmmintrin_h=no %ifarch %{ix86} --enable-nasm \ %endif - --disable-mp3x \ --enable-mp3rtp %make_build @@ -72,9 +69,6 @@ rm -rf %{buildroot}%{_docdir}/%{name} make test -%ldconfig_scriptlets libs - - %files %doc README TODO USAGE doc/html/*.html %{_bindir}/lame @@ -84,7 +78,7 @@ make test %files libs %doc ChangeLog %license COPYING LICENSE -%{_libdir}/libmp3lame.so.0* +%{_libdir}/libmp3lame.so.0{,.*} %files devel %doc API HACKING STYLEGUIDE @@ -92,18 +86,56 @@ make test %{_includedir}/lame %{_includedir}/lame.h + %changelog -* Tue Oct 09 2018 Wim Taymans - 3.100-6 -- Fix nasm build flags -- Resolves: #1630577 +* Tue Oct 29 2024 Troy Dawson - 3.100-19 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Tue Oct 09 2018 Wim Taymans - 3.100-5 -- Add dwarf debug symbols -- Resolves: #1630577 +* Mon Jun 24 2024 Troy Dawson - 3.100-18 +- Bump release for June 2024 mass rebuild -* Wed Jun 06 2018 Colin Walters - 3.100-4 -- Drop mp3x subpackage - https://src.fedoraproject.org/rpms/lame/pull-request/1 +* Thu Jan 25 2024 Fedora Release Engineering - 3.100-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.100-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 3.100-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.100-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.100-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 3.100-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.100-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 3.100-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.100-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 3.100-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Dec 20 2019 Robert Scheck - 3.100-7 +- Disable packaging of gtk+-based lame-mp3x (#1760961, #1760995 #c1) + +* Thu Jul 25 2019 Fedora Release Engineering - 3.100-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 3.100-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.100-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Wed Feb 07 2018 Fedora Release Engineering - 3.100-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild