diff --git a/.gitignore b/.gitignore index 4fd3c92..a93b93e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ /vdr-plugin-graphlcd-1.0.1.tar.bz2 +/vdr-plugin-graphlcd-1.0.2.tar.bz2 +/vdr-plugin-graphlcd-1.0.3.tar.bz2 +/vdr-plugin-graphlcd-1.0.4.tar.bz2 +/vdr-plugin-graphlcd-1.0.5.tar.bz2 +/vdr-plugin-graphlcd-1.0.6.tar.bz2 +/vdr-graphlcd-1.0.6.tar.gz +/vdr-graphlcd-1.0.8.tar.gz diff --git a/ShowReplayLogo.patch b/ShowReplayLogo.patch new file mode 100644 index 0000000..e55e8b6 --- /dev/null +++ b/ShowReplayLogo.patch @@ -0,0 +1,23 @@ +--- vdr-plugin-graphlcd-1.0.2/HISTORY.orig 2021-01-17 10:44:27.261268246 +0100 ++++ vdr-plugin-graphlcd-1.0.2/HISTORY 2021-01-17 10:45:26.609536637 +0100 +@@ -1,6 +1,9 @@ + VDR Plugin 'graphlcd' Revision History + ------------------------------------- + ++2021-01-17 ++- Fix name inconsistency between read and write of setup config value "ShowReplayLogo" ++ + 2020-08-19: Version 1.0.2 + - Fixed VDR version detection in Makefile + +--- vdr-plugin-graphlcd-1.0.2/menu.c.orig 2021-01-17 10:44:20.885239414 +0100 ++++ vdr-plugin-graphlcd-1.0.2/menu.c 2021-01-17 10:46:28.168815025 +0100 +@@ -87,7 +87,7 @@ + SetupStore("ShowVolume", GraphLCDSetup.ShowVolume = newGraphLCDSetup.ShowVolume); + SetupStore("ShowNotRecording", GraphLCDSetup.ShowNotRecording = newGraphLCDSetup.ShowNotRecording); + SetupStore("IdentifyReplayType", GraphLCDSetup.IdentifyReplayType = newGraphLCDSetup.IdentifyReplayType); +- SetupStore("ReplayLogo", GraphLCDSetup.ShowReplayLogo = newGraphLCDSetup.ShowReplayLogo); ++ SetupStore("ShowReplayLogo", GraphLCDSetup.ShowReplayLogo = newGraphLCDSetup.ShowReplayLogo); + SetupStore("ModifyReplayString", GraphLCDSetup.ModifyReplayString = newGraphLCDSetup.ModifyReplayString); + SetupStore("ScrollMode", GraphLCDSetup.ScrollMode = newGraphLCDSetup.ScrollMode); + SetupStore("ScrollSpeed", GraphLCDSetup.ScrollSpeed = newGraphLCDSetup.ScrollSpeed); diff --git a/sources b/sources index 7edb04e..a0ce6c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vdr-plugin-graphlcd-1.0.1.tar.bz2) = 2d7ec1018013b54dd17bf894cc7dc4ecfbbc549d18b6cf64460891204ca8b5cc84b0d756a2ab866011b11d4525e0c1fe93bf90f447a195044717b8f63a878566 +SHA512 (vdr-graphlcd-1.0.8.tar.gz) = ffd9295763bb91861a9067370224071b139bfe163eee8cde9e47d2fd0e129c873f7d998bfeec4fa0bcd91fe94e5e611a916862f20a7336d0a6073913a03a76ea diff --git a/vdr-graphlcd.spec b/vdr-graphlcd.spec index 9413498..bdaaf8a 100644 --- a/vdr-graphlcd.spec +++ b/vdr-graphlcd.spec @@ -1,19 +1,31 @@ %global rname vdr-plugin-graphlcd %global sname graphlcd +# 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-graphlcd -Version: 1.0.1 -Release: 3%{?dist} +Version: 1.0.8 +Release: 5%{?dist} Summary: VDR plugin: Output to graphic LCD -License: GPLv2+ -URL: http://projects.vdr-developer.org/projects/show/graphlcd/ -Source0: https://projects.vdr-developer.org/git/%{rname}.git/snapshot/%{rname}-%{version}.tar.bz2 +License: GPL-2.0-or-later +URL: https://github.com/vdr-projects/vdr-plugin-graphlcd +Source0: https://github.com/vdr-projects/%{rname}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.conf Source2: %{name}.conf.sample Source3: %{name}-fonts.conf + +BuildRequires: make BuildRequires: gcc-c++ +BuildRequires: gettext BuildRequires: pkgconfig(freetype2) -BuildRequires: vdr-devel >= 1.6.0 +BuildRequires: vdr-devel >= %{vdr_version} BuildRequires: graphlcd-devel Requires: vdr(abi)%{?_isa} = %{vdr_apiversion} Requires: dejavu-sans-fonts @@ -25,7 +37,7 @@ about the current state of VDR on displays supported by the GraphLCD driver library. %prep -%autosetup -n %{rname}-%{version} +%autosetup -p1 -n %{rname}-%{version} # W: file-not-utf8 iconv -f iso-8859-1 -t utf-8 HISTORY > HISTORY.utf8 ; mv HISTORY.utf8 HISTORY @@ -46,10 +58,10 @@ ln -s %{_datadir}/fonts/bitstream-vera/{Vera,VeraBd}.ttf \ %{buildroot}%{vdr_resdir}/plugins/graphlcd/fonts/ install -Dpm 644 %{SOURCE1} \ - %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/%{name}.conf + %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/%{sname}.conf install -Dpm 644 %{SOURCE2} \ - %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/%{name}.conf.sample + %{buildroot}%{_sysconfdir}/sysconfig/vdr-plugins.d/%{sname}.conf.sample install -Dpm 644 %{SOURCE3} \ %{buildroot}%{vdr_resdir}/plugins/%{sname}/fonts.conf @@ -66,10 +78,131 @@ install -Dpm 644 %{SOURCE3} \ %config(noreplace) %{vdr_resdir}/plugins/%{sname}/*.alias %config(noreplace) %{vdr_resdir}/plugins/%{sname}/fonts.conf %{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion} -%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{name}.conf -%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{name}.conf.sample +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{sname}.conf +%config(noreplace) %{_sysconfdir}/sysconfig/vdr-plugins.d/%{sname}.conf.sample %changelog +* Fri Jul 25 2025 Martin Gansser - 1.0.8-5 +- Rebuilt for new VDR API version 2.7.7 + +* Fri Jul 25 2025 Fedora Release Engineering - 1.0.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sat Jun 21 2025 Martin Gansser - 1.0.8-3 +- Rebuilt for new VDR API version 2.7.6 + +* Tue May 27 2025 Martin Gansser - 1.0.8-2 +- Rebuilt for new VDR API version 2.7.5 + +* Fri Feb 28 2025 Martin Gansser - 1.0.8-1 +- Update to 1.0.8 +- Rebuilt for new VDR API version 2.7.4 + +* Sun Jan 19 2025 Fedora Release Engineering - 1.0.6-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Oct 09 2024 Martin Gansser - 1.0.6-19 +- Rebuilt for new VDR API version 2.7.2 + +* Mon Sep 30 2024 Martin Gansser - 1.0.6-18 +- Add 0002-graphlcd-Removal-of-deprecated-interface-functions.patch for vdr-2.7.x + +* Fri Jul 26 2024 Miroslav Suchý - 1.0.6-17 +- convert license to SPDX + +* Mon Jul 15 2024 Martin Gansser - 1.0.6-16 +- Rebuilt for new VDR API version 2.6.9 + +* Thu Jul 11 2024 Martin Gansser - 1.0.6-15 +- Rebuilt for new VDR API version 2.6.8 + +* Fri Apr 12 2024 Martin Gansser - 1.0.6-14 +- Rebuilt for new VDR API version + +* Fri Jan 26 2024 Martin Gansser - 1.0.6-13 +- Rebuilt for new VDR API version + +* Fri Jan 05 2024 Martin Gansser - 1.0.6-12 +- Rebuilt for new VDR API version +- Add BR gettext for rawhide + +* Sat Jul 22 2023 Fedora Release Engineering - 1.0.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 14 2022 Martin Gansser - 1.0.6-9 +- Rebuilt for new VDR API version + +* Thu Dec 01 2022 Martin Gansser - 1.0.6-8 +- Rebuilt for new VDR API version + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Feb 04 2022 Martin Gansser - 1.0.6-6 +- Rebuilt for new VDR API version + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 30 2021 Martin Gansser - 1.0.6-4 +- Rebuilt for new VDR API version + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Apr 28 2021 Martin Gansser - 1.0.6-2 +- Rebuilt for new VDR API version + +* Thu Mar 11 2021 Martin Gansser - 1.0.6-1 +- Update to 1.0.6 + +* Wed Feb 17 2021 Martin Gansser - 1.0.5-1 +- Update to 1.0.5 + +* Mon Feb 08 2021 Martin Gansser - 1.0.4-1 +- Update to 1.0.4 +- Renamed config file (sample) included in RPM are not used and has to be renamed + fixes (BZ#1926073) + +* Thu Jan 28 2021 Martin Gansser - 1.0.3-1 +- Update to 1.0.3 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Jan 17 2021 Martin Gansser - 1.0.2-5 +- Add ShowReplayLogo.patch fix (BZ #1917097) + +* Sun Jan 03 2021 Martin Gansser - 1.0.2-4 +- Rebuilt for new VDR API version + +* Fri Aug 28 2020 Martin Gansser - 1.0.2-3 +- Rebuilt for new VDR API version + +* Wed Aug 19 2020 Martin Gansser - 1.0.2-2 +- Update 1.0.2 + +* Mon Aug 17 2020 Martin Gansser - 1.0.1-9 +- Rebuilt for new version of graphlcd-base-2.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 1.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 18 2019 Martin Gansser - 1.0.1-5 +- Rebuilt for new VDR API version + +* Sun Feb 03 2019 Fedora Release Engineering - 1.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Nov 20 2018 Martin Gansser - 1.0.1-3 - Rebuilt