[kodi] Update to 21.1

commit 746a5175a4fe158a6a156fdd6748c009aec0301d Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Tue Aug 20 14:30:11 2024 +0100 Update to 21.1 kodi-21-find-if.patch | 10 --------- kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 49 ++++++++++++++++++++++++--------------------- sources | 2 +- 4 files changed, 28 insertions(+), 35 deletions(-) --- diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 6b6e215..ded006e 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=21 -MINORVERSION=0 +MINORVERSION=1 #GITCOMMIT=b6daed5dc4f8ab6d0b50cc8bcb80bfb9e6a3e583 #GITSHORT=b6daed5 CODENAME=Omega diff --git a/kodi.spec b/kodi.spec index 9d90c4c..8b28978 100644 --- a/kodi.spec +++ b/kodi.spec @@ -38,8 +38,8 @@ %endif Name: kodi -Version: 21.0 -Release: 3%{?dist} +Version: 21.1 +Release: 1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -75,13 +75,10 @@ Source5: ffmpeg-5.1.2-Nexus-Alpha3.tar.gz Source6: apache-groovy-binary-4.0.16.zip # Set program version parameters -Patch1: kodi-20-versioning.patch - -# Compiler error -Patch2: kodi-21-find-if.patch +Patch0: kodi-20-versioning.patch # Python-3.13 fix -Patch3: fix_py313.patch +Patch1: fix_py313.patch %ifarch x86_64 %global _with_crystalhd 1 @@ -147,6 +144,7 @@ BuildRequires: libXinerama-devel BuildRequires: libXmu-devel BuildRequires: libXrandr-devel BuildRequires: libXtst-devel +BuildRequires: libappstream-glib BuildRequires: libass-devel >= 0.9.7 %if 0%{?_with_libbluray} BuildRequires: libbluray-devel @@ -315,9 +313,8 @@ This package contains FirewallD files for Kodi. pushd .. unzip %{SOURCE6} popd -%patch -P 1 -p1 -b.versioning -%patch -P 2 -p1 -b.find-if -%patch -P 3 -p1 -b.py313 +%patch -P 0 -p1 -b.versioning +%patch -P 1 -p1 -b.py313 # Fix up Python shebangs %py3_shebang_fix \ @@ -369,9 +366,11 @@ export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig" rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ desktop-file-install \ - --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir=%{buildroot}%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.xbmc.kodi.metainfo.xml + # Stop shipping the duplicate xsession file rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop @@ -381,16 +380,16 @@ install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib ln -s %{python3_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL # Move man-pages into system dir -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ -mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ +mkdir -p %{buildroot}%{_mandir}/ +mv docs/manpages %{buildroot}%{_mandir}/man1/ # Remove wiiremote man page if support was disabled %if ! 0%{?_with_cwiid} -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/kodi-wiiremote.1 +rm -f %{buildroot}%{_mandir}/man1/kodi-wiiremote.1 %endif # Remove duplicate binary -rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker +rm -f %{buildroot}%{_bindir}/TexturePacker %post firewalld @@ -409,11 +408,12 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker %{_datadir}/xsessions/kodi.desktop %{_datadir}/applications/kodi.desktop %{_datadir}/icons/hicolor/*/*/*.png -%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml -%{_mandir}/man1/kodi.1.gz -%{_mandir}/man1/kodi.bin.1.gz -%{_mandir}/man1/kodi-standalone.1.gz -%{_mandir}/man1/kodi-TexturePacker.1.gz +%{_datadir}/icons/hicolor/scalable/apps/kodi.svg +%{_metainfodir}/org.xbmc.kodi.metainfo.xml +%{_mandir}/man1/kodi.1.* +%{_mandir}/man1/kodi.bin.1.* +%{_mandir}/man1/kodi-standalone.1.* +%{_mandir}/man1/kodi-TexturePacker.1.* %files devel @@ -430,10 +430,10 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker %if 0%{?_with_cwiid} %{_bindir}/kodi-wiiremote %endif -%{_mandir}/man1/kodi-ps3remote.1.gz -%{_mandir}/man1/kodi-send.1.gz +%{_mandir}/man1/kodi-ps3remote.1.* +%{_mandir}/man1/kodi-send.1.* %if 0%{?_with_cwiid} -%{_mandir}/man1/kodi-wiiremote.1.gz +%{_mandir}/man1/kodi-wiiremote.1.* %endif @@ -449,6 +449,9 @@ rm -f ${RPM_BUILD_ROOT}%{_bindir}/TexturePacker %changelog +* Tue Aug 20 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 21.1-1 +- Update to 21.1 + * Sat Jul 27 2024 Leigh Scott <leigh123linux(a)gmail.com&gt; - 21.0-3 - Rebuild for new fmt diff --git a/sources b/sources index 1acfd14..6addf32 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (kodi-21.0-patched.tar.xz) = 654bdd757a3c38078c4b9ddc2910120fb75cf2db67c1f8152b556f0948c48a133e4d87fb565e1165d8e3415ff05a166bce16640339fa3c730fd1653e8fca0bb7 +SHA512 (kodi-21.1-patched.tar.xz) = 9d1cb59a2d32a5716a3669675c1a01f825848801125c59d65b37cff61770db9ccc13b753aa109f4b9e36bbe5c240c9c771333ac558b7d6f199e1407e08d4ef1e SHA512 (kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz) = 51e6fc033121241354a5f0b3fc9a430577ae3ff6bb7f31445aa548ef4893037fb80eea3b2c6774c81e9ebaf9c45e9b490c98c2c65eb38f9f7daba84b236f7e1d SHA512 (kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz) = 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e SHA512 (apache-groovy-binary-4.0.16.zip) = 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0