diff --git a/.gitignore b/.gitignore index 58e2b37..2d3bb3e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ 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 2f64483..4beeee7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xawtv-3.107.tar.bz2) = 29935e9265a96223097e6c4ab65d06c45233238992901d63aa3008e6f35cb59d474cebabd4136e47451242ba35df9ef08f9ef762c01ad688833429bc72d61536 +SHA512 (xawtv-3.106.tar.bz2) = 79d69455a85626fde130cf60dabab5733b8031200bf998dc3199c3a511cb87e3a07b4d975829b192fafafda052f6fce93a193ba5e0e5728d38ba3022e880d68e diff --git a/xawtv-3.107-XawListChange.patch b/xawtv-3.107-XawListChange.patch deleted file mode 100644 index 7e9ae94..0000000 --- a/xawtv-3.107-XawListChange.patch +++ /dev/null @@ -1,28 +0,0 @@ -# -# 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-strsignal.patch b/xawtv-strsignal.patch deleted file mode 100644 index 72ba8a6..0000000 --- a/xawtv-strsignal.patch +++ /dev/null @@ -1,47 +0,0 @@ -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 07ae627..93c037b 100644 --- a/xawtv.spec +++ b/xawtv.spec @@ -2,18 +2,14 @@ Summary: TV applications for video4linux compliant devices Name: xawtv -Version: 3.107 -Release: 18%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Version: 3.106 +Release: 4%{?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 +BuildRequires: gcc BuildRequires: mesa-libGL-devel, libXaw-devel, libXext-devel BuildRequires: libXft-devel, libXinerama-devel BuildRequires: libXpm-devel, libXrandr-devel, libXt-devel @@ -32,7 +28,7 @@ BuildRequires: ImageMagick desktop-file-utils libappstream-glib BuildRequires: libv4l-devel BuildRequires: perl-interpreter -Requires: polkit xorg-x11-fonts-misc hicolor-icon-theme +Requires: usermode xorg-x11-fonts-misc hicolor-icon-theme %description Xawtv is a simple xaw-based TV program which uses the bttv driver or @@ -60,11 +56,9 @@ which support teletext. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 %build -export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -fcommon" +export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign" %configure %{!?_with_quicktime: --disable-quicktime} make %{?_smp_mflags} verbose=yes @@ -93,58 +87,45 @@ done # v4l-conf stuff -mkdir -p $RPM_BUILD_ROOT%{_libexecdir} $RPM_BUILD_ROOT%{_datadir}/polkit-1/actions +mkdir -p $RPM_BUILD_ROOT%{_sbindir} \ + $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \ + $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps \ -mv $RPM_BUILD_ROOT%{_bindir}/v4l-conf $RPM_BUILD_ROOT%{_libexecdir}/ +cat >v4l-conf.pam <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 +cat >v4l-conf.apps < - 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 - -* 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) - -* 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 - -* 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) - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* Sat Jul 27 2019 Fedora Release Engineering - 3.106-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Feb 21 2019 Mauro Carvalho Chehab - 3.106-1 - upgrade to version 3.106