commit 60e6461b5b78162a417d66be654ea608fc037571 Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; Date: Mon Jan 13 09:48:57 2020 +0100 Update to 3.8.8 .gitignore | 1 + ...vr-iptvsimple-3.4.2-use_external_rapidxml.patch | 48 ---------------------- kodi-pvr-iptvsimple-3.8.8-rapidxml.patch | 24 +++++++++++ kodi-pvr-iptvsimple.spec | 23 +++++------ sources | 2 +- 5 files changed, 36 insertions(+), 62 deletions(-) --- diff --git a/.gitignore b/.gitignore index 97af5bb..f7ec443 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /kodi-pvr-iptvsimple-2a649d7.tar.gz /pvr.iptvsimple-933a5c4.tar.gz /pvr.iptvsimple-e8effad.tar.gz +/pvr.iptvsimple-3.8.8.tar.gz diff --git a/kodi-pvr-iptvsimple-3.8.8-rapidxml.patch b/kodi-pvr-iptvsimple-3.8.8-rapidxml.patch new file mode 100644 index 0000000..922c6b2 --- /dev/null +++ b/kodi-pvr-iptvsimple-3.8.8-rapidxml.patch @@ -0,0 +1,24 @@ +diff -up ./FindRapidxml.cmake.orig ./FindRapidxml.cmake +--- ./FindRapidxml.cmake.orig 2019-11-28 16:20:32.000000000 +0100 ++++ ./FindRapidxml.cmake 2020-01-09 16:37:25.659943579 +0100 +@@ -4,7 +4,7 @@ + # RAPIDXML_FOUND - system has rapidxml + # RAPIDXML_INCLUDE_DIRS - the rapidxml include directory + +-find_path(RAPIDXML_INCLUDE_DIRS rapidxml/rapidxml.hpp) ++find_path(RAPIDXML_INCLUDE_DIRS rapidxml.h) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Rapidxml DEFAULT_MSG RAPIDXML_INCLUDE_DIRS) +diff -up ./src/PVRIptvData.cpp.orig ./src/PVRIptvData.cpp +--- ./src/PVRIptvData.cpp.orig 2019-11-28 16:20:32.000000000 +0100 ++++ ./src/PVRIptvData.cpp 2020-01-09 16:37:25.659943579 +0100 +@@ -35,7 +35,7 @@ + #include <string> + + #include "zlib.h" +-#include "rapidxml/rapidxml.hpp" ++#include "rapidxml.h" + #include "PVRIptvData.h" + #include "p8-platform/util/StringUtils.h" + #include "client.h" diff --git a/kodi-pvr-iptvsimple.spec b/kodi-pvr-iptvsimple.spec index a050546..0c3eb40 100644 --- a/kodi-pvr-iptvsimple.spec +++ b/kodi-pvr-iptvsimple.spec @@ -1,23 +1,20 @@ -%global commit e8effadebc349d38f7b8a2c190baa72ebf74b6fe -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20180825 - %global kodi_addon pvr.iptvsimple %global kodi_version 18.0 +%global kodi_codename Leia Name: kodi-%(tr "." "-" <<<%{kodi_addon}) # Use Epoch to manage upgrades from older upstream # (https://github.com/opdenkamp/xbmc-pvr-addons/) Epoch: 1 -Version: 3.5.3 -Release: 3%{?dist} +Version: 3.8.8 +Release: 1%{?dist} Summary: Simple IPTV PVR for Kodi License: GPLv2+ URL: https://github.com/kodi-pvr/%{kodi_addon}/ -Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{shortcommit}/%{kodi_a... -# Use external rapidxml library -Patch0: %{name}-3.4.2-use_external_rapidxml.patch +Source0: %{url}/archive/%{version}-%{kodi_codename}/%{kodi_addon}-%{version}.tar.gz +# Fix rapidxml detection +Patch0: %{name}-3.8.8-rapidxml.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -34,10 +31,7 @@ ExcludeArch: %{power64} ppc64le %prep -%autosetup -n %{kodi_addon}-%{commit} -p0 - -# Drop bundled rapidxml library -rm -r lib/rapidxml/ +%autosetup -n %{kodi_addon}-%{version}-%{kodi_codename} -p0 %build @@ -56,6 +50,9 @@ rm -r lib/rapidxml/ %changelog +* Thu Jan 09 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org&gt; - 1:3.8.8-1 +- Update to 3.8.8 + * Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1:3.5.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 3e55f71..5d9e00c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dca03ed2037133d5c1ebfa0795e3ee1 pvr.iptvsimple-e8effad.tar.gz +SHA512 (pvr.iptvsimple-3.8.8.tar.gz) = 32c95c2e314eba3c4871c50fdc024be276874b790339c5b558425bb960080784533dcbadbab64c7b76b598c08bfca384fb3b1fa618447eaf30870e296d4c5e46