diff --git a/new-expresson-cLircRemote.patch b/new-expresson-cLircRemote.patch deleted file mode 100644 index 8cf3342..0000000 --- a/new-expresson-cLircRemote.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/remote.c.orig 2022-12-01 09:46:20.818313857 +0100 -+++ b/remote.c 2022-12-01 09:51:59.088629349 +0100 -@@ -796,7 +796,7 @@ - - #ifdef REMOTE_FEATURE_LIRC - case 'l': -- new cLircRemote(devnam[i]); // use vdr's lirc code -+ cLircRemote::NewLircRemote(devnam[i]); // use vdr's lirc code - break; - #endif - #ifdef REMOTE_FEATURE_LIRCOLD diff --git a/sources b/sources index ed0aa68..78df1de 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ SHA512 (vdr-remote-0.7.0.tgz) = 18c758e9cd519ffc6ccd2a1b53109d7f1ac1c65a32ae43b9eae41ea64ff2ec9721c557ca75a03620b9fee1463608ab0a84d09fad31e233804695570eadec3728 SHA512 (vdr-plugin-remote_0.3.8-3.ds.diff.gz) = 973585a70ee1849d0fab724a416e4bbf8ff418ee90012e39709f4e832caaf90bb896d04a83a690c8edd196d5f4b957dcd33d06b7a318e5508805da5734353325 +SHA512 (vdr-remote.conf) = 4a7642cf01321faab7aed112966b90fae1bc523f1f5dd8714f4c6939bb801e7eb8a9548f9d930373777f65dfc9d63595ab5e738159690b9f6fec7655fe6d0170 +SHA512 (vdr-remote-udev.rules) = 91d16b6ff4063e7836e0de96e83ce86db34ebc865e3f811c76d32ecadc18a9615fb9cdd84d1a5ffa8dcf1ac0ed0122f794f69535fca3a0ee68f3c08f5f6cf781 diff --git a/vdr-remote-gcc11.patch b/vdr-remote-gcc11.patch deleted file mode 100644 index 47fa8a3..0000000 --- a/vdr-remote-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index f535aed..dc0c2ba 100644 ---- a/Makefile -+++ b/Makefile -@@ -41,7 +41,7 @@ TMPDIR ?= /tmp - ### The compiler options: - - export CFLAGS = $(call PKGCFG,cflags) --export CXXFLAGS = $(call PKGCFG,cxxflags) -+export CXXFLAGS = -std=c++14 $(call PKGCFG,cxxflags) - - ### The version number of VDR's plugin API: - diff --git a/vdr-remote.spec b/vdr-remote.spec index 7caac86..a7de0a1 100644 --- a/vdr-remote.spec +++ b/vdr-remote.spec @@ -1,33 +1,22 @@ %global pname remote %global __provides_exclude_from ^%{vdr_libdir}/.*\\.so.*$ -# Set vdr_version based on Fedora version -%if 0%{?fedora} >= 43 -%global vdr_version 2.7.7 -%elif 0%{?fedora} == 42 -%global vdr_version 2.7.4 -%else -%global vdr_version 2.6.9 -%endif - Name: vdr-%{pname} Version: 0.7.0 -Release: 41%{?dist} +Release: 11%{?dist} Summary: Extended remote control plugin for VDR -License: GPL-1.0-or-later + +License: GPL+ URL: http://www.escape-edv.de/endriss/vdr/ Source0: http://www.escape-edv.de/endriss/vdr/%{name}-%{version}.tgz Source1: %{name}.conf Source2: %{name}-udev.rules # Status query mail sent to upstream and Debian patchkit maintainer 2008-10-25 Patch0: http://zap.tartarus.org/~ds/debian/dists/stable/main/source/vdr-plugin-remote_0.3.8-3.ds.diff.gz -Patch1: vdr-remote-gcc11.patch -Patch2: new-expresson-cLircRemote.patch -BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: vdr-devel >= %{vdr_version} +BuildRequires: vdr-devel >= 1.7.38 BuildRequires: gettext BuildRequires: systemd Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} @@ -38,6 +27,7 @@ Requires: systemd >= 214-3 This plugin extends VDR's remote control capabilities, adding support for Linux input devices, keyboards (tty), TCP connections, and LIRC. + %prep %autosetup -n %{pname}-%{version} -p1 @@ -52,9 +42,11 @@ for f in CONTRIBUTORS HISTORY ; do iconv -f iso-8859-1 -t utf-8 $f > $f.utf-8 ; mv $f.utf-8 $f done + %build %make_build + %install %make_install install -Dpm 644 %{SOURCE1} \ @@ -63,9 +55,11 @@ install -Dpm 644 %{SOURCE2} \ %{buildroot}/%{_udevrulesdir}/52-%{name}.rules %find_lang %{name} + %pre usermod -a -G input %{vdr_user} || : + %files -f %{name}.lang %license COPYING %doc CONTRIBUTORS FAQ HISTORY README @@ -73,98 +67,8 @@ usermod -a -G input %{vdr_user} || : %config(noreplace) %{_udevrulesdir}/*-%{name}.rules %{vdr_libdir}/libvdr-%{pname}.so.%{vdr_apiversion} + %changelog -* Fri Jul 25 2025 Martin Gansser - 0.7.0-41 -- Rebuilt for new VDR API version 2.7.7 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.7.0-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jun 21 2025 Martin Gansser - 0.7.0-39 -- Rebuilt for new VDR API version 2.7.6 - -* Tue May 27 2025 Martin Gansser - 0.7.0-38 -- Rebuilt for new VDR API version 2.7.5 - -* Fri Feb 28 2025 Martin Gansser - 0.7.0-37 -- Rebuilt for new VDR API version 2.7.4 - -* Sun Jan 19 2025 Fedora Release Engineering - 0.7.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Oct 09 2024 Martin Gansser - 0.7.0-35 -- Rebuilt for new VDR API version 2.7.2 - --* Sat Jul 20 2024 Fedora Release Engineering - 0.7.0-34 --- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 15 2024 Martin Gansser - 0.7.0-33 -- Rebuilt for new VDR API version 2.6.9 - -* Thu Jul 11 2024 Martin Gansser - 0.7.0-32 -- Rebuilt for new VDR API version 2.6.8 - -* Mon Jun 17 2024 Miroslav Suchý - 0.7.0-31 -- convert license to SPDX - -* Thu Apr 11 2024 Martin Gansser - 0.7.0-30 -- Rebuilt for new VDR API version - -* Fri Jan 26 2024 Martin Gansser - 0.7.0-29 -- Rebuilt for new VDR API version - -* Thu Jan 04 2024 Martin Gansser - 0.7.0-28 -- Rebuilt for new VDR API version - -* Sat Jul 22 2023 Fedora Release Engineering - 0.7.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.7.0-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Dec 14 2022 Martin Gansser - 0.7.0-25 -- Rebuilt for new VDR API version - -* Thu Dec 01 2022 Martin Gansser - 0.7.0-24 -- Rebuilt for new VDR API version -- Add patch new-expresson-cLircRemote.patch - -* Sat Jul 23 2022 Fedora Release Engineering - 0.7.0-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Martin Gansser - 0.7.0-22 -- Rebuilt for new VDR API version - -* Sat Jan 22 2022 Fedora Release Engineering - 0.7.0-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Dec 30 2021 Martin Gansser - 0.7.0-20 -- Rebuilt for new VDR API version - -* Fri Jul 23 2021 Fedora Release Engineering - 0.7.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Apr 28 2021 Martin Gansser - 0.7.0-18 -- Rebuilt for new VDR API version - -* Wed Jan 27 2021 Fedora Release Engineering - 0.7.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Jan 03 2021 Martin Gansser - 0.7.0-16 -- Rebuilt for new VDR API version - -* Fri Aug 28 2020 Martin Gansser - 0.7.0-15 -- Rebuilt for new VDR API version - -* Wed Aug 19 2020 Jeff Law - 0.7.0-14 --- Force C++14 as this code is not C++17 ready - -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.7.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Sat Jul 27 2019 Fedora Release Engineering - 0.7.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild