From 7261b17c4ffbde42cf6416f3282870557fc7f7ab Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sat, 16 May 2020 01:46:01 +0200 Subject: [PATCH 01/21] Bump to version 3.107 - fix some issues with gcc 10.1; - some fixes at v4l-conf for it to check if a devnode exists, before opening it in R/W mode. Signed-off-by: Mauro Carvalho Chehab --- .gitignore | 1 + sources | 2 +- xawtv.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2d3bb3e..58e2b37 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xawtv-3.98.tar.bz2 /xawtv-3.103.tar.bz2 /xawtv-3.105.tar.bz2 /xawtv-3.106.tar.bz2 +/xawtv-3.107.tar.bz2 diff --git a/sources b/sources index 4beeee7..2f64483 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xawtv-3.106.tar.bz2) = 79d69455a85626fde130cf60dabab5733b8031200bf998dc3199c3a511cb87e3a07b4d975829b192fafafda052f6fce93a193ba5e0e5728d38ba3022e880d68e +SHA512 (xawtv-3.107.tar.bz2) = 29935e9265a96223097e6c4ab65d06c45233238992901d63aa3008e6f35cb59d474cebabd4136e47451242ba35df9ef08f9ef762c01ad688833429bc72d61536 diff --git a/xawtv.spec b/xawtv.spec index b8c2514..73c0422 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,8 +2,8 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.106 -Release: 6%{?dist} +Version: 3.107 +Release: 1%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -151,6 +151,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 +- upgrade to version 3.107 + * Fri Jan 31 2020 Fedora Release Engineering - 3.106-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Use gcc -fcommon flag to build From 4b091097da2a8618462c38589ee91af0a7856b51 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Thu, 23 Jul 2020 21:52:05 -0600 Subject: [PATCH 02/21] - Use strsignal, not sys_siglist --- xawtv-strsignal.patch | 47 +++++++++++++++++++++++++++++++++++++++++++ xawtv.spec | 7 ++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 xawtv-strsignal.patch diff --git a/xawtv-strsignal.patch b/xawtv-strsignal.patch new file mode 100644 index 0000000..72ba8a6 --- /dev/null +++ b/xawtv-strsignal.patch @@ -0,0 +1,47 @@ +diff --git a/console/fbtools.c b/console/fbtools.c +index 9f876df..07739ff 100644 +--- a/console/fbtools.c ++++ b/console/fbtools.c +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } +diff --git a/console/record.c b/console/record.c +index 685221b..90f0c85 100644 +--- a/console/record.c ++++ b/console/record.c +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + +diff --git a/x11/rootv.c b/x11/rootv.c +index 60a8406..4bf458b 100644 +--- a/x11/rootv.c ++++ b/x11/rootv.c +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); diff --git a/xawtv.spec b/xawtv.spec index 73c0422..e708a24 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,11 +3,12 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 +Patch0: xawtv-strsignal.patch BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel @@ -56,6 +57,7 @@ which support teletext. %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" @@ -151,6 +153,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Thu Jul 23 2020 Jeff Law - 3.107.2 +- Use strsignal, not sys_siglist + * Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 - upgrade to version 3.107 From f4ea78514740cf31f653c5b1c8dfc466294b9758 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:27:27 +0000 Subject: [PATCH 03/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index e708a24..8fd0f6c 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -153,6 +153,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Jeff Law - 3.107.2 - Use strsignal, not sys_siglist From bb1260368d03534fd0c02a9ae365340a107b3006 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Sat, 26 Sep 2020 15:35:43 +0300 Subject: [PATCH 04/21] . --- xawtv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 8fd0f6c..fc33560 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -156,10 +156,10 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf * Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Thu Jul 23 2020 Jeff Law - 3.107.2 +* Thu Jul 23 2020 Jeff Law - 3.107-2 - Use strsignal, not sys_siglist -* Sat May 16 2020 Mauro Carvalho Chehab - 3.107.1 +* Sat May 16 2020 Mauro Carvalho Chehab - 3.107-1 - upgrade to version 3.107 * Fri Jan 31 2020 Fedora Release Engineering - 3.106-6 From e4cf0a354763032ae357cfe85bd53143c3931aef Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:08:14 +0000 Subject: [PATCH 05/21] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xawtv.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xawtv.spec b/xawtv.spec index fc33560..95cd6c8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -10,6 +10,7 @@ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Patch0: xawtv-strsignal.patch +BuildRequires: make BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel From ea3dd8d395baf36f57a6b26f37bc84be1e11e787 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:47:49 +0000 Subject: [PATCH 06/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 95cd6c8..234dc18 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.107-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.107-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c72181f9875ab610bfb6e54b17aa03054aa74cc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:16:58 +0000 Subject: [PATCH 07/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 234dc18..c5df4bc 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.107-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 3.107-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d18ea31e7a7fba9578c221380e418b52b2fffd97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:48:34 +0000 Subject: [PATCH 08/21] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index c5df4bc..c99b330 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 3.107-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 3.107-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 8a7f5f3cff16008b0e2fae2ea46350edf6b0ac20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:47:20 +0000 Subject: [PATCH 09/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index c99b330..8dcba86 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 3.107-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 3.107-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 496626024f016fe8f028d2928a94f534fe74f006 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:09:06 +0000 Subject: [PATCH 10/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 8dcba86..43b75c0 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.107-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 3.107-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From efb101deb2506134cd5ca8de109a414957917f91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:31:24 +0000 Subject: [PATCH 11/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 43b75c0..8074b1d 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.107-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.107-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e0b4184086da8b2e2351e9c3f98c6002422bde0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:19:54 +0000 Subject: [PATCH 12/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 8074b1d..62945bc 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -154,6 +154,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.107-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 3.107-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 44737a4de341d54100f605730df0bad3c1ba6526 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Tue, 30 Jan 2024 04:35:57 +0300 Subject: [PATCH 13/21] Fix incompatible pointer types warning (#2261796) --- xawtv-3.107-XawListChange.patch | 28 ++++++++++++++++++++++++++++ xawtv.spec | 7 ++++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 xawtv-3.107-XawListChange.patch diff --git a/xawtv-3.107-XawListChange.patch b/xawtv-3.107-XawListChange.patch new file mode 100644 index 0000000..7e9ae94 --- /dev/null +++ b/xawtv-3.107-XawListChange.patch @@ -0,0 +1,28 @@ +# +# Since https://gitlab.freedesktop.org/xorg/lib/libxaw/-/commit/197e9d055f3cd351 +# XawListChange() want the second argument to be (const char **) instead of (char **). +# +# To avoid compiler issues when -Wcompatible-pointer-types just cast it to (void *) . +# + +diff -Nrup xawtv-3.107/x11/propwatch.c xawtv-3.107-OK/x11/propwatch.c +--- xawtv-3.107/x11/propwatch.c 2020-05-16 02:32:25.000000000 +0300 ++++ xawtv-3.107-OK/x11/propwatch.c 2024-01-30 04:16:55.411559253 +0300 +@@ -316,7 +316,7 @@ RebuildList(void) + for (i=0, this=watchlist; this!=NULL; i++, this=this->next) + str_list[i] = this->text; + qsort(str_list,str_count,sizeof(char*),cmp); +- XawListChange(bl,str_count ? str_list : &empty, ++ XawListChange(bl,(void *)(str_count ? str_list : &empty), + str_count ? str_count : 1,1000,1); + } + +@@ -495,7 +495,7 @@ ProcessPropertyChange(Display *dpy, XEve + AddWatch(dpy,event->xproperty.window, i); + else { + Update(dpy,event->xproperty.window,event->xproperty.atom); +- XawListChange(bl,str_list,str_count,1000,1); ++ XawListChange(bl,(void *)str_list,str_count,1000,1); + } + } + } diff --git a/xawtv.spec b/xawtv.spec index 62945bc..ecbb843 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,12 +3,13 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 Patch0: xawtv-strsignal.patch +Patch1: xawtv-3.107-XawListChange.patch BuildRequires: make BuildRequires: gcc @@ -59,6 +60,7 @@ which support teletext. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" @@ -154,6 +156,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Tue Jan 30 2024 Dmitry Butskoy - 3.107-11 +- fix incompatible pointer types warnings (#2261796) + * Sat Jan 27 2024 Fedora Release Engineering - 3.107-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 445fad2a087e54f8dcbdb53592370081e3d2893e Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 14/21] Eliminate use of obsolete %patchN syntax (#2283636) --- xawtv.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index ecbb843..2b86ad6 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -59,8 +59,8 @@ which support teletext. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" From 09b65267ec0ef101c0ced8cdd63c4c247b33f47f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:42:55 +0000 Subject: [PATCH 15/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 2b86ad6..868bbe3 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -156,6 +156,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.107-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 30 2024 Dmitry Butskoy - 3.107-11 - fix incompatible pointer types warnings (#2261796) From 6af3948a1e682de3b422c7712975301661a631ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:45:05 +0200 Subject: [PATCH 16/21] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xawtv.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 868bbe3..a815a8b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,8 +3,9 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 12%{?dist} -License: GPLv2+ +Release: 13%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv Source0: http://linuxtv.org/downloads/xawtv/%{name}-%{version}.tar.bz2 @@ -156,6 +157,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jul 26 2024 Miroslav Suchý - 3.107-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 3.107-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 364667d0710133338744595eeb6d797cdba3fcf4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:25:48 +0000 Subject: [PATCH 17/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index a815a8b..45ab4e8 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 13%{?dist} +Release: 14%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -157,6 +157,9 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.107-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 3.107-13 - convert license to SPDX From 5f0ef07e614a68d0343dad54735807c9fb5eb9a1 Mon Sep 17 00:00:00 2001 From: Dmitry Butskoy Date: Fri, 24 Jan 2025 09:04:15 +0300 Subject: [PATCH 18/21] Switch to PolicyKit, and no more use /usr/sbin --- xawtv.spec | 69 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/xawtv.spec b/xawtv.spec index 45ab4e8..f64e9e3 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 14%{?dist} +Release: 15%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -13,7 +13,7 @@ Patch0: xawtv-strsignal.patch Patch1: xawtv-3.107-XawListChange.patch BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel @@ -32,7 +32,7 @@ BuildRequires: ImageMagick desktop-file-utils libappstream-glib BuildRequires: libv4l-devel BuildRequires: perl-interpreter -Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme +Requires: polkit xorg-x11-fonts-misc hicolor-icon-theme %description Xawtv is a simple xaw-based TV program which uses the bttv driver or @@ -93,45 +93,58 @@ done # v4l-conf stuff -mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ - $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ - $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ +mkdir -p $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions -cat >v4l-conf.pam <v4l-conf.apps <v4l-conf.sh <v4l-conf.policy < + + + + XawTV Project + %{url} + + + + Run v4l-conf with privileges required + Authentication is required for privileged operations of v4l-conf + + no + no + yes + + %{_libexecdir}/v4l-conf + true + + + +EOF +install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/org.fedoraproject.v4l.conf.policy -mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_sbindir}/ -ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %files %doc README TODO contrib/frequencies* %license COPYING -%config(noreplace) %{_sysconfdir}/pam.d/v4l-conf -%config(noreplace) %{_sysconfdir}/security/console.apps/v4l-conf %{_bindir}/* %exclude %{_bindir}/motv %exclude %{_bindir}/mtt -%{_sbindir}/* +%{_libexecdir}/* %{_libdir}/xawtv %{_datadir}/xawtv %{_datadir}/X11/app-defaults/Xawtv %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop +%{_datadir}/polkit-1/actions/* %{_mandir}/man?/* %exclude %{_mandir}/man1/motv.1* %exclude %{_mandir}/man1/mtt.1* @@ -157,6 +170,10 @@ ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/v4l-conf %changelog +* Fri Jan 24 2025 Dmitry Butskoy - 3.107-15 +- switch to PolicyKit (#502723) +- avoid /usr/sbin dir (#2341562) + * Sun Jan 19 2025 Fedora Release Engineering - 3.107-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 90520da929c5806b899eadc84da197dd14e341e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:37:47 +0000 Subject: [PATCH 19/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index f64e9e3..881622e 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 15%{?dist} +Release: 16%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.107-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 24 2025 Dmitry Butskoy - 3.107-15 - switch to PolicyKit (#502723) - avoid /usr/sbin dir (#2341562) From fcfc7f73c02cc7a56f37a6f6054359aec0dc717b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:27:38 +0000 Subject: [PATCH 20/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 881622e..4c7ec4a 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 16%{?dist} +Release: 17%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 3.107-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 3.107-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5539e087c1dd657ebe40a8b9cb5a5600dc018c99 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:01:03 +0000 Subject: [PATCH 21/21] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xawtv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xawtv.spec b/xawtv.spec index 4c7ec4a..07ae627 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -3,7 +3,7 @@ Summary: TV applications for video4linux compliant devices Name: xawtv Version: 3.107 -Release: 17%{?dist} +Release: 18%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://linuxtv.org/wiki/index.php/Xawtv @@ -170,6 +170,9 @@ install -p -m 644 v4l-conf.policy $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions/or %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 3.107-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 3.107-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild