Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1 +1,4 @@
 zvbi-0.2.33.tar.bz2
+/zvbi-0.2.42.tar.gz
+/zvbi-0.2.43.tar.gz
+/zvbi-0.2.44.tar.gz

sources

@@ -1 +1 @@
-95e53eb208c65ba6667fd4341455fa27  zvbi-0.2.35.tar.bz2
+SHA512 (zvbi-0.2.44.tar.gz) = 74b7d44faf42f919ebd3ccb69f8567f56909075d3acf4a3b4dfcbdf85489492f27d8a04173e0010f59706356e4078cd10911945f87e2596de2b897672d1e55cb

zvbi.spec

@@ -2,30 +2,29 @@
 %define             catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:               zvbi
-Version:            0.2.35
-Release:            13%{?dist}
+Version:            0.2.44
+Release:            2%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
-# See NEWS for a full breakdown of licensing.
-License:            LGPLv2+ and GPLv2+ and BSD
-URL:                http://zapping.sourceforge.net/ZVBI/index.html
-Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
+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:            https://github.com/zapping-vbi/zvbi/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
 
-BuildRequires: make
-BuildRequires:      gcc-c++
+BuildRequires:      autoconf
+BuildRequires:      automake
+BuildRequires:      bdftopcf
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
-BuildRequires:      gettext >= 0.16.1
-BuildRequires:      libpng-devel
+BuildRequires:      gcc-c++
+BuildRequires:      gettext-devel
 BuildRequires:      libICE-devel
-BuildRequires:      bdftopcf
+BuildRequires:      libpng-devel
+BuildRequires:      libtool
+BuildRequires:      make
 BuildRequires:      mkfontdir
 BuildRequires:      systemd-units
-
-Requires(post):     systemd-units
-Requires(preun):    systemd-units
-Requires(postun):   systemd-units
+BuildRequires:      tzdata
 
 
 %description
@@ -48,7 +47,7 @@ Development files for zvbi
 
 %package fonts
 Summary:            Fonts from zvbi converted to X11
-BuildArch:	    noarch
+BuildArch:          noarch
 Obsoletes:          xawtv-tv-fonts < 3.95
 Provides:           xawtv-tv-fonts >= 3.95
 
@@ -58,11 +57,8 @@ Fonts from zvbi converted for use with X11
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-
-# Fix character encodings
-iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
+%patch -P 0 -p1
+%patch -P 1 -p1
 
 # systemd service file
 cat >zvbid.service <<EOF
@@ -81,11 +77,16 @@ EOF
 
 
 %build
+./autogen.sh
 # Note: We don't do --enable-static=no because static libs are needed to build
 # x11font during compile time to convert zvbi fonts into x11 fonts. x11font
 # is thrown away and not installed as it's not useful for anything else
 %configure --disable-rpath --enable-v4l --enable-dvb --enable-proxy
-make %{?_smp_mflags}
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+%make_build
 
 # Generate fonts, fonts.alias and fonts.dir
 pushd contrib
@@ -103,7 +104,7 @@ popd
 
 %install
 mkdir -p %{buildroot}%{fontdir}
-make install DESTDIR=%{buildroot}
+%make_install
 
 %find_lang %{name}
 
@@ -118,6 +119,13 @@ touch %{buildroot}%{fontdir}/fonts.cache-1
 mkdir -p %{buildroot}%{catalogue}
 ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
+find %{buildroot}%{_libdir} -name '*.a' -delete
+
+
+%check
+cd test
+make check
+
 
 %post
 %systemd_post zvbid.service
@@ -132,14 +140,16 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
 
 %files -f %{name}.lang
+%license COPYING.md
+%doc AUTHORS BUGS ChangeLog NEWS README.md TODO
 %{_bindir}/%{name}*
+%if ! (0%{?fedora} >= 42)
 %{_sbindir}/zvbid
+%endif
 %{_unitdir}/zvbid.service
-%{_libdir}/*.so.*
-%{_mandir}/man1/*
-%exclude %{_libdir}/*.a
-%exclude %{_libdir}/*.la
-%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO
+%{_libdir}/libzvbi.so.0*
+%{_libdir}/libzvbi-chains.so.0*
+%{_mandir}/man1/zvbi*1*
 
 
 %files devel
@@ -158,6 +168,55 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.44-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Mar 14 2025 Xavier Bachelot <xavier@bachelot.org> - 0.2.44-1
+- Update to 0.2.44 (RHBZ#2351225)
+- Acknowledge for bin/sbin merge in F42+
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.43-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Dec 10 2024 Xavier Bachelot <xavier@bachelot.org> - 0.2.43-1
+- Update to 0.2.43 (RHBZ#2330170)
+
+* Fri Sep 13 2024 Xavier Bachelot <xavier@bachelot.org> - 0.2.42-1
+- Update to 0.2.42
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed May 17 2023 David Cantrell <dcantrell@redhat.com> - 0.2.35-20
+- Update License tag to use SPDX identifiers
+- Change deprecated %%patchN macros to %%patch -P N
+
+* Sun Feb 05 2023 Kalev Lember <klember@redhat.com> - 0.2.35-19
+- Avoid requiring systemd for systemd rpm scriptlets
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- avoid rpath in binaries
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.2.35-14
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Mon Mar  1 2021 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.2.35-13
 - Fix BuildRequires (#1933652)