From fcfdada6b05d016d9e15ba02aa308cbbb1680359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 13 Jun 2021 14:55:11 +0200 Subject: [PATCH 1/5] Bootstrap --- aom.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/aom.spec b/aom.spec index 9fc6ef1..e02d1bc 100644 --- a/aom.spec +++ b/aom.spec @@ -1,6 +1,7 @@ %global sover 3 # git describe %global aom_version v3.1.1 +%bcond_without bootstrap # Use commit with updated changelog for correct versioning %global commit 7fadc0e77130efb05f52979b0deaba9b6a1bba6d @@ -29,7 +30,9 @@ BuildRequires: gcc BuildRequires: cmake3 BuildRequires: doxygen BuildRequires: git-core +%if %{without bootstrap} BuildRequires: graphviz +%endif BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: python3-devel @@ -88,7 +91,9 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCONFIG_WEBM_IO=1 \ +%if %{without bootstrap} -DENABLE_DOCS=1 \ +%endif -DENABLE_TESTS=0 \ -DCONFIG_ANALYZER=0 \ -DBUILD_SHARED_LIBS=1 \ @@ -116,7 +121,9 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so.%{sover}* %files -n libaom-devel +%if %{without bootstrap} %doc %{_vpath_builddir}/docs/html/ +%endif %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc From 8a0bda1e20ea5bb0771bd60889026aff47b45b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 13 Jun 2021 15:21:40 +0200 Subject: [PATCH 2/5] Adjust bootstrap --- aom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index e02d1bc..191d7a0 100644 --- a/aom.spec +++ b/aom.spec @@ -28,9 +28,9 @@ Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 -BuildRequires: doxygen BuildRequires: git-core %if %{without bootstrap} +BuildRequires: doxygen BuildRequires: graphviz %endif BuildRequires: perl-interpreter From 9b2a3361e35838e83cc16ef373073fc63184aabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 13 Jun 2021 16:49:14 +0200 Subject: [PATCH 3/5] Unbootstrap --- aom.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/aom.spec b/aom.spec index 191d7a0..9fc6ef1 100644 --- a/aom.spec +++ b/aom.spec @@ -1,7 +1,6 @@ %global sover 3 # git describe %global aom_version v3.1.1 -%bcond_without bootstrap # Use commit with updated changelog for correct versioning %global commit 7fadc0e77130efb05f52979b0deaba9b6a1bba6d @@ -28,11 +27,9 @@ Source0: https://aomedia.googlesource.com/%{name}/+archive/%{commit}.tar.gz#/ BuildRequires: gcc-c++ BuildRequires: gcc BuildRequires: cmake3 -BuildRequires: git-core -%if %{without bootstrap} BuildRequires: doxygen +BuildRequires: git-core BuildRequires: graphviz -%endif BuildRequires: perl-interpreter BuildRequires: perl(Getopt::Long) BuildRequires: python3-devel @@ -91,9 +88,7 @@ sed -i 's@set(aom_version "")@set(aom_version "%{aom_version}")@' build/cmake/ve -DCMAKE_SKIP_RPATH=1 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCONFIG_WEBM_IO=1 \ -%if %{without bootstrap} -DENABLE_DOCS=1 \ -%endif -DENABLE_TESTS=0 \ -DCONFIG_ANALYZER=0 \ -DBUILD_SHARED_LIBS=1 \ @@ -121,9 +116,7 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/libaom.so.%{sover}* %files -n libaom-devel -%if %{without bootstrap} %doc %{_vpath_builddir}/docs/html/ -%endif %{_includedir}/%{name} %{_libdir}/libaom.so %{_libdir}/pkgconfig/%{name}.pc From 24232ad46e9daba9ca4d59b07c79b9ed92c20cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 21 Nov 2021 23:24:52 +0100 Subject: [PATCH 4/5] Rebuild (jpegxl) --- aom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aom.spec b/aom.spec index 9fc6ef1..b4acebd 100644 --- a/aom.spec +++ b/aom.spec @@ -17,7 +17,7 @@ Name: aom Version: 3.1.1 -Release: 1%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} +Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} Summary: Royalty-free next-generation video format License: BSD @@ -122,6 +122,9 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Nov 21 2021 Björn Esser - 3.1.1-2 +- Rebuild (jpegxl) + * Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin - 3.1.1-1 - Update to 3.1.1 - Close: rhbz#1954337 From 1774bd45e8630e22237f065a3c7e052611575f52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 22 Nov 2021 20:01:22 +0100 Subject: [PATCH 5/5] Fix spec --- aom.spec | 75 -------------------------------------------------------- 1 file changed, 75 deletions(-) diff --git a/aom.spec b/aom.spec index bcd89cb..bddab7b 100644 --- a/aom.spec +++ b/aom.spec @@ -15,13 +15,8 @@ %endif Name: aom -<<<<<<< HEAD -Version: 3.1.1 -Release: 2%{?prerelease:.%{snapshotdate}git%{shortcommit}}%{?dist} -======= Version: 3.2.0 Release: %autorelease ->>>>>>> rawhide Summary: Royalty-free next-generation video format License: BSD @@ -126,74 +121,4 @@ rm -rvf %{buildroot}%{_libdir}/libaom.a %{_libdir}/pkgconfig/%{name}.pc %changelog -<<<<<<< HEAD -* Sun Nov 21 2021 Björn Esser - 3.1.1-2 -- Rebuild (jpegxl) - -* Sun Jun 13 12:47:37 CEST 2021 Robert-André Mauchin - 3.1.1-1 -- Update to 3.1.1 -- Close: rhbz#1954337 -- Security fix for CVE-2021-30473 -- Fix: rhbz#1961375 -- Fix: rhbz#1961376 -- Security fix for CVE-2021-30475 -- Fix: rhbz#1968017 -- Fix: rhbz#1968018 - -* Wed Mar 10 2021 Leigh Scott - 2.0.1-5 -- Rebuild for new libvmaf version - -* Tue Jan 26 2021 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Wim Taymans - 2.0.1-3 -- Disable vmaf on rhel - -* Tue Dec 15 01:26:44 CET 2020 Robert-André Mauchin - 2.0.1-2 -- Disable tests - -* Sat Dec 05 21:18:20 CET 2020 Robert-André Mauchin - 2.0.1-1 -- Update to 2.0.1 -- Close rhbz#1852847 - -* Tue Jul 28 16:30:33 CEST 2020 Robert-André Mauchin - 2.0.0-3 -- Fix FTBFS - -* Mon Jul 27 2020 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 01 14:33:18 CEST 2020 Robert-André Mauchin - 2.0.0-1 -- Update to 2.0.0 (#1852847) - -* Tue Jan 28 2020 Fedora Release Engineering - 1.0.0-9.20190810git9666276 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 09 17:45:23 CEST 2019 Robert-André Mauchin - 1.0.0-8.20190810git9666276 -- Update to commit 9666276accea505cd14cbcb9e3f7ff5033da9172 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.0.0-7.20180925gitd0076f5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.0.0-6.20180925gitd0076f5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Tue Sep 25 2018 Robert-André Mauchin - 1.0.0-5.20180925gitd0076f5 -- Update to commit d0076f507a6027455540e2e4f25f84ca38803e07 -- Set CONFIG_LOWBITDEPTH to 1 -- Fix #1632658 - -* Thu Sep 13 2018 Robert-André Mauchin - 1.0.0-4 -- Split the package into libs/tools - -* Tue Sep 11 2018 Robert-André Mauchin - 1.0.0-3 -- Update the archive in order to detect the correct version from the changelog - -* Thu Jul 12 2018 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 07 2018 Robert-André Mauchin - 1.0.0-1 -- First RPM release - -======= %autochangelog ->>>>>>> rawhide