[kodi] Update to 18.0 beta 2
commit cb3926bf18c475bfd08f9d47b3be610ff17299a1
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Fri Sep 28 08:59:46 2018 -0500
Update to 18.0 beta 2
.gitignore | 2 +-
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 17 +++++++++++++++--
sources | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dde6826..aca26cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/kodi-18.0b1v2-patched.tar.xz
/kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
/kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
+/kodi-18.0b2-patched.tar.xz
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 3fd4a9a..09e093f 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=0b1v2
+MINORVERSION=0b2
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index 58acb76..dcb6b84 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE b1v2
+%global PRERELEASE b2
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.8.b1%{?dist}
+Release: 0.9.b2%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -194,6 +194,7 @@ BuildRequires: pixman-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: python2-devel
BuildRequires: python2-pillow
+BuildRequires: /usr/bin/pathfix.py
BuildRequires: rapidjson-devel
BuildRequires: sqlite-devel
BuildRequires: swig
@@ -334,6 +335,15 @@ This package contains the Kodi binary for X11 servers.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.assert
+# Fix up Python shebangs
+pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
+ tools/EventClients/lib/python/zeroconf.py \
+ tools/EventClients/Clients/PS3BDRemote/ps3_remote.py \
+ tools/EventClients/lib/python/ps3/sixaxis.py \
+ tools/EventClients/lib/python/ps3/sixpair.py \
+ tools/EventClients/lib/python/ps3/sixwatch.py \
+ tools/EventClients/Clients/KodiSend/kodi-send.py \
+ tools/EventClients/lib/python/xbmcclient.py
%build
@@ -471,6 +481,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Thu Sep 27 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.9.b2
+- Kodi 18.0 beta 2
+
* Fri Aug 31 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.8.b1
- Fix Requires and versioning in new split packages
diff --git a/sources b/sources
index 8075ee6..4769bcb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-1708584c564024241b32ff67bd566966 kodi-18.0b1v2-patched.tar.xz
+a1893cc1488d2c81bcba8d5fad0e2384 kodi-18.0b2-patched.tar.xz
2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz