2:27 p.m.
commit 27ee06e81bbe6395f16d5d46fdc0b690ddd4d43e
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Mon Mar 19 15:27:38 2018 +0100
Update to latest stable release for Kodi 18
.gitignore | 1 +
gpl-2.0.txt | 339 ---------------------
...r-iptvsimple-2.4.11-use_external_rapidxml.patch | 12 -
...vr-iptvsimple-3.4.2-use_external_rapidxml.patch | 48 +++
kodi-pvr-iptvsimple.spec | 32 +-
sources | 2 +-
6 files changed, 64 insertions(+), 370 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f17b6bd..30a3d7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/kodi-pvr-iptvsimple-d782816.tar.gz
/kodi-pvr-iptvsimple-2a649d7.tar.gz
+/pvr.iptvsimple-933a5c4.tar.gz
diff --git a/kodi-pvr-iptvsimple-3.4.2-use_external_rapidxml.patch
b/kodi-pvr-iptvsimple-3.4.2-use_external_rapidxml.patch
new file mode 100644
index 0000000..7a32157
--- /dev/null
+++ b/kodi-pvr-iptvsimple-3.4.2-use_external_rapidxml.patch
@@ -0,0 +1,48 @@
+diff -up ./lib/rapidxml/rapidxml_iterators.hpp.orig
./lib/rapidxml/rapidxml_iterators.hpp
+--- ./lib/rapidxml/rapidxml_iterators.hpp.orig 2018-02-05 09:22:58.000000000 +0100
++++ ./lib/rapidxml/rapidxml_iterators.hpp 2018-03-15 02:53:30.000985600 +0100
+@@ -7,7 +7,7 @@
+ //! \file rapidxml_iterators.hpp This file contains rapidxml iterators
+
+ #include <iterator>
+-#include "rapidxml.hpp"
++#include <rapidxml.h>
+
+ namespace rapidxml
+ {
+diff -up ./lib/rapidxml/rapidxml_print.hpp.orig ./lib/rapidxml/rapidxml_print.hpp
+--- ./lib/rapidxml/rapidxml_print.hpp.orig 2018-02-05 09:22:58.000000000 +0100
++++ ./lib/rapidxml/rapidxml_print.hpp 2018-03-15 02:53:29.996985693 +0100
+@@ -6,7 +6,7 @@
+ // Revision $DateTime: 2009/05/13 01:46:17 $
+ //! \file rapidxml_print.hpp This file contains rapidxml printer implementation
+
+-#include "rapidxml.hpp"
++#include <rapidxml.h>
+
+ // Only include streams if not disabled
+ #ifndef RAPIDXML_NO_STREAMS
+diff -up ./lib/rapidxml/rapidxml_utils.hpp.orig ./lib/rapidxml/rapidxml_utils.hpp
+--- ./lib/rapidxml/rapidxml_utils.hpp.orig 2018-02-05 09:22:58.000000000 +0100
++++ ./lib/rapidxml/rapidxml_utils.hpp 2018-03-15 02:53:30.003985529 +0100
+@@ -7,7 +7,7 @@
+ //! \file rapidxml_utils.hpp This file contains high-level rapidxml utilities that can
be useful
+ //! in certain simple scenarios. They should probably not be used if maximizing
performance is the main objective.
+
+-#include "rapidxml.hpp"
++#include <rapidxml.h>
+ #include <vector>
+ #include <string>
+ #include <fstream>
+diff -up ./src/PVRIptvData.cpp.orig ./src/PVRIptvData.cpp
+--- ./src/PVRIptvData.cpp.orig 2018-02-05 09:22:58.000000000 +0100
++++ ./src/PVRIptvData.cpp 2018-03-15 02:54:00.617229220 +0100
+@@ -30,7 +30,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 838f3cb..4d7ff2c 100644
--- a/kodi-pvr-iptvsimple.spec
+++ b/kodi-pvr-iptvsimple.spec
@@ -1,26 +1,23 @@
-%global commit 2a649d7e21b64c4fa4a8b14c2cc139261eebc7e8
-%global short_commit %(c=%{commit}; echo ${c:0:7})
-%global commit_date 20170817
+%global commit 933a5c4043ffba9ac05d4f0a4687bc8f61d5a9a2
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commitdate 20180205
%global kodi_addon pvr.iptvsimple
-%global kodi_version 17.0
+%global kodi_version 18.0
Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 2.4.14
-Release: 2%{?dist}
-Summary: Kodi's IPTV Simple client addon
+Version: 3.4.2
+Release: 1%{?dist}
+Summary: Simple IPTV PVR for Kodi
-Group: Applications/Multimedia
License: GPLv2+
URL: https://github.com/kodi-pvr/%{kodi_addon}/
-Source0:
https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}...
-# GPLv2 license file
-Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+Source0:
https://github.com/kodi-pvr/%{kodi_addon}/archive/%{shortcommit}/%{kodi_a...
# Use external rapidxml library
-Patch0: %{name}-2.4.11-use_external_rapidxml.patch
+Patch0: %{name}-3.4.2-use_external_rapidxml.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -33,8 +30,7 @@ Requires: kodi >= %{kodi_version}
ExclusiveArch: i686 x86_64
%description
-Kodi PVR addon for IPTV support, with M3U playlists, streaming of live TV for
-multicast/unicast sources, listening to radio channels and EPG.
+%{summary}.
%prep
@@ -43,11 +39,9 @@ multicast/unicast sources, listening to radio channels and EPG.
# Drop bundled rapidxml library
rm -r lib/rapidxml/
-cp -p %{SOURCE1} .
-
%build
-%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ .
+%cmake .
%make_build
@@ -57,12 +51,14 @@ cp -p %{SOURCE1} .
%files
%doc README.md %{kodi_addon}/changelog.txt
-%license gpl-2.0.txt
%{_libdir}/kodi/addons/%{kodi_addon}/
%{_datadir}/kodi/addons/%{kodi_addon}/
%changelog
+* Fri Mar 16 2018 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:3.4.2-1
+- Update to latest stable release for Kodi 18
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> -
1:2.4.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
diff --git a/sources b/sources
index f1fcde4..e0aafc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed23ee8daded68981b749a25d8d0e28e kodi-pvr-iptvsimple-2a649d7.tar.gz
+bd6254c151bb2ecbe7fa049bb9d1115a pvr.iptvsimple-933a5c4.tar.gz