From 1759f87111df20648951100a1c3bf0fa4bf3c1b7 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Tue, 10 Dec 2024 12:51:19 +0100 Subject: [PATCH 1/5] Update to 0.2.43 (RHBZ#2330170) --- .gitignore | 1 + sources | 2 +- zvbi-0.2.42-fix_sincos_declaration.patch | 51 ------------------------ zvbi.spec | 8 ++-- 4 files changed, 6 insertions(+), 56 deletions(-) delete mode 100644 zvbi-0.2.42-fix_sincos_declaration.patch diff --git a/.gitignore b/.gitignore index a05bce2..1e9a398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ zvbi-0.2.33.tar.bz2 /zvbi-0.2.42.tar.gz +/zvbi-0.2.43.tar.gz diff --git a/sources b/sources index 5d9c577..6192031 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvbi-0.2.42.tar.gz) = 65ebbab09d0180f62c2016fe3462786a6f89d0ee414f9983d1a89582bff0c17e58fcb8f45690add0314bd3b7d2de86f82e97fd49c93842e0a4f294b2b5508687 +SHA512 (zvbi-0.2.43.tar.gz) = 7216e6a3538e4b37d11dd45e5ebaf2b7c0c3b4ba4824e5854d508711f6a048fb9c3bb7b02262c0d91ef3019568ca1119b4b46043a23d1176edfcc78d48f70f48 diff --git a/zvbi-0.2.42-fix_sincos_declaration.patch b/zvbi-0.2.42-fix_sincos_declaration.patch deleted file mode 100644 index be243e2..0000000 --- a/zvbi-0.2.42-fix_sincos_declaration.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 429cf9337588d6e028bd1dc4633953b4eff09597 Mon Sep 17 00:00:00 2001 -From: Ileana Dumitrescu -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 - --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 --#include --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]) diff --git a/zvbi.spec b/zvbi.spec index ccc226d..0c7d482 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,7 +2,7 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.42 +Version: 0.2.43 Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library License: GPL-2.0-or-later AND LGPL-2.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND MIT @@ -10,8 +10,6 @@ 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 -# slightly adapted from https://github.com/zapping-vbi/zvbi/commit/ae74ae513714f81b9b8abdb12e1b235d16fad74e.patch -Patch2: zvbi-0.2.42-fix_sincos_declaration.patch BuildRequires: autoconf BuildRequires: automake @@ -61,7 +59,6 @@ Fonts from zvbi converted for use with X11 %setup -q %patch -P 0 -p1 %patch -P 1 -p1 -%patch -P 2 -p1 # systemd service file cat >zvbid.service < - 0.2.43-1 +- Update to 0.2.43 (RHBZ#2330170) + * Fri Sep 13 2024 Xavier Bachelot - 0.2.42-1 - Update to 0.2.42 From cc4275d37c0101b130d4f7fe7ae877ee89eb0ef3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:54:19 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 0c7d482..7f4f490 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.43 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library 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 @@ -166,6 +166,9 @@ make check %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.2.43-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 10 2024 Xavier Bachelot - 0.2.43-1 - Update to 0.2.43 (RHBZ#2330170) From 7d6b85c779620a4924a57bbdc0d4ca15c27c8d75 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 14 Mar 2025 09:44:41 +0100 Subject: [PATCH 3/5] Update to 0.2.44 (RHBZ#2351225) --- .gitignore | 1 + sources | 2 +- zvbi.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1e9a398..b7cf58c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +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 diff --git a/sources b/sources index 6192031..0c6fcd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zvbi-0.2.43.tar.gz) = 7216e6a3538e4b37d11dd45e5ebaf2b7c0c3b4ba4824e5854d508711f6a048fb9c3bb7b02262c0d91ef3019568ca1119b4b46043a23d1176edfcc78d48f70f48 +SHA512 (zvbi-0.2.44.tar.gz) = 74b7d44faf42f919ebd3ccb69f8567f56909075d3acf4a3b4dfcbdf85489492f27d8a04173e0010f59706356e4078cd10911945f87e2596de2b897672d1e55cb diff --git a/zvbi.spec b/zvbi.spec index 7f4f490..72e0d3d 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -2,8 +2,8 @@ %define catalogue %{_sysconfdir}/X11/fontpath.d Name: zvbi -Version: 0.2.43 -Release: 2%{?dist} +Version: 0.2.44 +Release: 1%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library 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 @@ -166,6 +166,9 @@ make check %changelog +* Fri Mar 14 2025 Xavier Bachelot - 0.2.44-1 +- Update to 0.2.44 (RHBZ#2351225) + * Sun Jan 19 2025 Fedora Release Engineering - 0.2.43-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2cca179777fe49fcf521341dc751af8e3940436c Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Fri, 14 Mar 2025 10:06:56 +0100 Subject: [PATCH 4/5] Acknowledge for bin/sbin merge in F42+ --- zvbi.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zvbi.spec b/zvbi.spec index 72e0d3d..688d06e 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -143,7 +143,9 @@ make check %license COPYING.md %doc AUTHORS BUGS ChangeLog NEWS README.md TODO %{_bindir}/%{name}* +%if ! (0%{?fedora} >= 42) %{_sbindir}/zvbid +%endif %{_unitdir}/zvbid.service %{_libdir}/libzvbi.so.0* %{_libdir}/libzvbi-chains.so.0* @@ -168,6 +170,7 @@ make check %changelog * Fri Mar 14 2025 Xavier Bachelot - 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 - 0.2.43-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 535d6f46e153336a3f114b1edfb4c97dec9386ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:21:47 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zvbi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zvbi.spec b/zvbi.spec index 688d06e..55b88a0 100644 --- a/zvbi.spec +++ b/zvbi.spec @@ -3,7 +3,7 @@ Name: zvbi Version: 0.2.44 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Raw VBI, Teletext and Closed Caption decoding library 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 @@ -168,6 +168,9 @@ make check %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.2.44-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Mar 14 2025 Xavier Bachelot - 0.2.44-1 - Update to 0.2.44 (RHBZ#2351225) - Acknowledge for bin/sbin merge in F42+