From 852c88e8c13cd3d85d23902170353125c1579a8f Mon Sep 17 00:00:00 2001
From: Funda Wang <fundawang@yeah.net>
Date: Tue, 1 Oct 2024 02:00:06 +0800
Subject: [PATCH] requires correct binaries

---
 zvbi.spec | 29 ++++++++++-------------------
 zvbi.yaml |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/zvbi.spec b/zvbi.spec
index 809a06a..c0b1e11 100644
--- a/zvbi.spec
+++ b/zvbi.spec
@@ -1,8 +1,8 @@
 Name:               zvbi
 Version:            0.2.42
-Release:            3
+Release:            4
 Summary:            A library provides functions to capture and decode VBI data
-License:            LGPLv2+ and GPLv2+ and BSD
+License:            GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT
 URL:                https://github.com/zapping-vbi/zvbi
 Source0:            %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
@@ -10,7 +10,7 @@ Patch0001:          %{name}-0.2.24-tvfonts.patch
 Patch0002:          %{name}-0.2.25-openfix.patch
 
 BuildRequires:      gcc-c++ doxygen fontconfig gettext >= 0.21.0 libpng-devel
-BuildRequires:      libICE-devel xorg-x11-font-utils systemd-units
+BuildRequires:      libICE-devel bdftopcf mkfontdir systemd-units
 BuildRequires:      autoconf automake libtool gettext-devel
 
 Requires(post):     systemd-units
@@ -34,16 +34,12 @@ with search function, various text export and rendering functions.
 
 %package            devel
 Summary:            Development files for zvbi
-Requires:           %{name} = %{version}-%{release} pkgconfig
+Requires:           %{name} = %{version}-%{release}
 
 %description        devel
 The zvbi-devel package contains development files for zvbi.
 
-%package            help
-Summary:            Documents for zvbi
-
-%description        help
-The zvbi-help package contains related documents.
+%package_help
 
 %prep
 %autosetup -n %{name}-%{version} -p1
@@ -63,7 +59,7 @@ EOF
 
 %build
 autoreconf -fi
-%configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy
+%configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy --disable-static
 %make_build
 
 cd contrib
@@ -82,7 +78,7 @@ cd ..
 install -d %{buildroot}%{_datadir}/fonts/%{name}
 %make_install
 
-%delete_la_and_a
+%delete_la
 
 %find_lang %{name}
 
@@ -96,22 +92,14 @@ install -d %{buildroot}%{_sysconfdir}/X11/fontpath.d
 ln -sf %{_datadir}/fonts/%{name} %{buildroot}%{_sysconfdir}/X11/fontpath.d/%{name}
 
 %post
-/sbin/ldconfig
 %systemd_post zvbid.service
 
-fc-cache -f %{_datadir}/fonts/%{name} || :
-
 %preun
 %systemd_preun zvbid.service
 
 %postun
-/sbin/ldconfig
 %systemd_postun_with_restart zvbid.service
 
-if [ "$1" = "0" ]; then
-    fc-cache -f %{_datadir}/fonts || :
-fi
-
 %files -f %{name}.lang
 %doc AUTHORS
 %license COPYING COPYING.md
@@ -136,6 +124,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Aug 08 2024 Funda Wang <fundawang@yeah.net> - 0.2.42-4
+- requires correct binaries
+
 * Sun Feb 04 2024 lvgenggeng <lvgenggeng@uniontech.com> 0.2.42-3
 - move license file to prefered dir
 
diff --git a/zvbi.yaml b/zvbi.yaml
index 2c26ff2..6d05a41 100644
--- a/zvbi.yaml
+++ b/zvbi.yaml
@@ -1,4 +1,4 @@
 version_control: github
 src_repo: zapping-vbi/zvbi
 tag_prefix: ^v
-seperator: .
+separator: .
-- 
Gitee