From a2729571d2620d0b12edfb6862778bbe8858b947 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 10 Dec 2021 16:04:47 +0000 Subject: [PATCH 1/3] Add model file for legacy apps that can't use the builtin models --- vmaf.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/vmaf.spec b/vmaf.spec index bc23bbb..cebfdb1 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -54,6 +54,12 @@ Obsoletes: %{name}-devel < %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package models +Summary: Model files for %{name} + +%description models +The %{name}-models package contains model files. +These are needed for apps that can't use the builtin models. %prep %autosetup -p1 @@ -80,6 +86,9 @@ cat > %{buildroot}%{rpmmacrodir}/macros.%{name} << EOF EOF touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} +mkdir -p %{buildroot}%{_datadir}/model/ +cp -Rp model/* %{buildroot}%{_datadir}/model/ + %check pushd libvmaf ninja -vC %{_vpath_builddir} test @@ -92,6 +101,9 @@ popd %doc FAQ.md README.md %{_bindir}/vmaf +%files models +%{_datadir}/model/ + %files -n libvmaf %doc CHANGELOG.md %license LICENSE From 80647d2482f7520d8c7e2da17ef9b706f6759d45 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 11 Dec 2021 12:56:05 +0000 Subject: [PATCH 2/3] fix sub-package arch --- vmaf.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/vmaf.spec b/vmaf.spec index cebfdb1..847b8dd 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -54,10 +54,12 @@ Obsoletes: %{name}-devel < %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package models -Summary: Model files for %{name} +%package models +Summary: Model files for %{name} +Requires: libvmaf = %{version}-%{release} +BuildArch: noarch -%description models +%description models The %{name}-models package contains model files. These are needed for apps that can't use the builtin models. @@ -82,7 +84,7 @@ popd mkdir -p %{buildroot}%{rpmmacrodir} cat > %{buildroot}%{rpmmacrodir}/macros.%{name} << EOF # libvmaf RPM Macros -%libvmaf_version %{version} +%libvmaf_version %{version} EOF touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} From 79895751a15be3f1e87dee90f1f2011e3ed9a129 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 11 Dec 2021 19:24:30 +0000 Subject: [PATCH 3/3] Bump changelog --- vmaf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmaf.spec b/vmaf.spec index 847b8dd..640027a 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -1,6 +1,6 @@ Name: vmaf Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Video Multi-Method Assessment Fusion License: BSD-2-Clause-Patent @@ -120,6 +120,9 @@ popd %changelog +* Sat Dec 11 2021 Leigh Scott - 2.1.1-3 +- Add models sub-package + * Fri Jul 23 2021 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild