Merge branch 'rawhide' into epel8

.gitignore

@@ -0,0 +1,2 @@
+zvbi-0.2.33.tar.bz2
+/zvbi-0.2.42.tar.gz

sources

@@ -1 +1 @@
-95e53eb208c65ba6667fd4341455fa27  zvbi-0.2.35.tar.bz2
+SHA512 (zvbi-0.2.42.tar.gz) = 65ebbab09d0180f62c2016fe3462786a6f89d0ee414f9983d1a89582bff0c17e58fcb8f45690add0314bd3b7d2de86f82e97fd49c93842e0a4f294b2b5508687

zvbi-0.2.42-fix_sincos_declaration.patch

@@ -0,0 +1,51 @@
+From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001
+From: Ileana Dumitrescu <ileanadumitrescu95@gmail.com>
+Date: Wed, 13 Mar 2024 17:42:18 +0200
+Subject: [PATCH] configure.ac: Move sincos function check to AC_CHECK_FUNCS
+
+---
+ configure.ac | 24 +-----------------------
+ 1 file changed, 1 insertion(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ba6f385..476fd69 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -89,7 +89,7 @@ AC_CHECK_FUNCS([alarm dup2 gethostbyaddr gethostbyname getopt_long gettimeofday
+ 		inet_ntoa localtime_r memmove memset mkdir modf munmap
+ 		nl_langinfo putenv select setenv setlocale socket strcasecmp
+ 		strchr strdup strerror strncasecmp strndup strrchr strstr
+-		strtol strtoul tzset strptime getaddrinfo])
++		strtol strtoul tzset strptime getaddrinfo sincos])
+ 
+ AM_CONDITIONAL(HAVE_STRPTIME, [test "x$HAVE_STRPTIME" = xyes])
+ 
+@@ -112,28 +112,6 @@ dnl autoconf 2.71 required additional quotations and usages of "AC_LANG_SOURCE".
+ dnl "Noteworthy changes in autoconf version 2.66 through 2.68"
+ dnl <https://autotools.info/forwardporting/autoconf.html>
+ 
+-dnl sincos() is a GNU extension (a macro, not a function).
+-dnl If not present we use a replacement.
+-AC_MSG_CHECKING([for sincos])
+-AC_LINK_IFELSE([AC_LANG_SOURCE([
+-#include <stdio.h>
+-#include <math.h>
+-int main (void) {
+-double s, c;
+-/* Make sure the compiler does not optimize sincos() away
+-   so the linker can confirm its availability. */
+-scanf ("%f", &s);
+-sincos (s, &s, &c);
+-printf ("%f %f", s, c);
+-return 0;
+-}
+-])],[
+-  AC_MSG_RESULT([yes])
+-  AC_DEFINE(HAVE_SINCOS, 1, [Define if the sincos() function is available])
+-],[
+-  AC_MSG_RESULT([no])
+-])
+-
+ dnl log2() is a GNU extension (a macro, not a function).
+ dnl If not present we use a replacement.
+ AC_MSG_CHECKING([for log2])

zvbi.spec

@@ -2,28 +2,31 @@
 %define             catalogue %{_sysconfdir}/X11/fontpath.d
 
 Name:               zvbi
-Version:            0.2.35
+Version:            0.2.42
-Release:            9%{?dist}
+Release:            1%{?dist}
 Summary:            Raw VBI, Teletext and Closed Caption decoding library
-# See NEWS for a full breakdown of licensing.
+License:            GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT
-License:            LGPLv2+ and GPLv2+ and BSD
+URL:                https://github.com/zapping-vbi/zvbi
-URL:                http://zapping.sourceforge.net/ZVBI/index.html
+Source0:            https://github.com/zapping-vbi/zvbi/archive/v%{version}/%{name}-%{version}.tar.gz
-Source0:            http://downloads.sourceforge.net/zapping/%{name}-%{version}.tar.bz2
 Patch0:             %{name}-0.2.24-tvfonts.patch
 Patch1:             %{name}-0.2.25-openfix.patch
+# slightly adapted from https://github.com/zapping-vbi/zvbi/commit/ae74ae513714f81b9b8abdb12e1b235d16fad74e.patch
+Patch2:             zvbi-0.2.42-fix_sincos_declaration.patch
 
-BuildRequires:      gcc-c++
+BuildRequires:      autoconf
+BuildRequires:      automake
+BuildRequires:      bdftopcf
 BuildRequires:      doxygen
 BuildRequires:      fontconfig
-BuildRequires:      gettext >= 0.16.1
+BuildRequires:      gcc-c++
-BuildRequires:      libpng-devel
+BuildRequires:      gettext-devel
 BuildRequires:      libICE-devel
-BuildRequires:      xorg-x11-font-utils
+BuildRequires:      libpng-devel
+BuildRequires:      libtool
+BuildRequires:      make
+BuildRequires:      mkfontdir
 BuildRequires:      systemd-units
-
+BuildRequires:      tzdata
-Requires(post):     systemd-units
-Requires(preun):    systemd-units
-Requires(postun):   systemd-units
 
 
 %description
@@ -46,7 +49,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
 
@@ -56,11 +59,9 @@ Fonts from zvbi converted for use with X11
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P 0 -p1
-%patch1 -p1
+%patch -P 1 -p1
-
+%patch -P 2 -p1
-# Fix character encodings
-iconv -f iso8859-1 README -t utf8 > README.conv && /bin/mv -f README.conv README
 
 # systemd service file
 cat >zvbid.service <<EOF
@@ -79,11 +80,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
@@ -101,7 +107,7 @@ popd
 
 %install
 mkdir -p %{buildroot}%{fontdir}
-make install DESTDIR=%{buildroot}
+%make_install
 
 %find_lang %{name}
 
@@ -116,6 +122,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
@@ -130,14 +143,14 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
 
 %files -f %{name}.lang
+%license COPYING.md
+%doc AUTHORS BUGS ChangeLog NEWS README.md TODO
 %{_bindir}/%{name}*
 %{_sbindir}/zvbid
 %{_unitdir}/zvbid.service
-%{_libdir}/*.so.*
+%{_libdir}/libzvbi.so.0*
-%{_mandir}/man1/*
+%{_libdir}/libzvbi-chains.so.0*
-%exclude %{_libdir}/*.a
+%{_mandir}/man1/zvbi*1*
-%exclude %{_libdir}/*.la
-%doc AUTHORS BUGS ChangeLog COPYING COPYING.LIB NEWS README TODO
 
 
 %files devel
@@ -156,6 +169,54 @@ ln -sf %{fontdir} %{buildroot}%{catalogue}/%{name}
 
 
 %changelog
+* 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)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.35-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild