commit 333223eb1301340ca41e976d184f5edb6f8cec93 Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Tue Aug 28 08:54:14 2018 -0500 Update to 18.0 beta 1 v2 .gitignore | 6 +++--- kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 33 +++++++++++++++++++-------------- sources | 6 +++--- 4 files changed, 26 insertions(+), 21 deletions(-) --- diff --git a/.gitignore b/.gitignore index 682af5e..dde6826 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/kodi-18.0a2-patched.tar.xz -/kodi-libdvdnav-6.0.0-Leia-Alpha-1.tar.gz -/kodi-libdvdread-6.0.0-Leia-Alpha-1.tar.gz +/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 diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index c2d9464..3fd4a9a 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=18 -MINORVERSION=0a2 +MINORVERSION=0b1v2 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 CODENAME=Leia diff --git a/kodi.spec b/kodi.spec index 7eac54e..7862429 100644 --- a/kodi.spec +++ b/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE a2 +%global PRERELEASE b1v2 #global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases @@ -25,7 +25,7 @@ Name: kodi Version: 18.0 -Release: 0.4.a2%{?dist} +Release: 0.5.b1%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -42,18 +42,18 @@ Source0: %{name}-%{DIRVERSION}-patched.tar.xz Source1: kodi-generate-tarball-xz.sh # kodi uses modified libdvd{css,nav,read} source and downloads at build time -# wget -O kodi-libdvdnav-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-1.tar.gz -Source2: kodi-libdvdnav-6.0.0-Leia-Alpha-1.tar.gz -# wget -O kodi-libdvdread-6.0.0-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-1.tar.gz -Source3: kodi-libdvdread-6.0.0-Leia-Alpha-1.tar.gz +# wget -O kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz +Source2: kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz +# wget -O kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz +Source3: kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz %if %{with dvdcss} -# wget -O kodi-libdvdcss-1.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-1.tar.gz -Source4: kodi-libdvdcss-1.4.1-Leia-Alpha-1.tar.gz +# wget -O kodi-libdvdcss-1.4.1-Leia-Alpha-3.tar.gz https://github.com/xbmc/libdvdcss/archive/1.4.1-Leia-Alpha-3.tar.gz +Source4: kodi-libdvdcss-1.4.1-Leia-Alpha-3.tar.gz %endif %if ! 0%{?_with_external_ffmpeg} -# wget -O ffmpeg-3.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/FFmpeg/archive/3.4.1-Leia-Alpha-1.tar.gz -Source5: ffmpeg-3.4.1-Leia-Alpha-1.tar.gz +# wget -O ffmpeg-4.0.2-Leia-Alpha3.tar.gz https://github.com/xbmc/FFmpeg/archive/4.0.2-Leia-Alpha3.tar.gz +Source5: ffmpeg-4.0.2-Leia-Alpha3.tar.gz %endif # Set program version parameters @@ -93,12 +93,14 @@ BuildRequires: faad2-devel BuildRequires: ffmpeg-devel %endif BuildRequires: flac-devel +BuildRequires: flatbuffers-devel BuildRequires: flex BuildRequires: fmt-devel BuildRequires: fontconfig-devel BuildRequires: fontpackages-devel BuildRequires: freetype-devel BuildRequires: fribidi-devel +BuildRequires: fstrcmp-devel %if 0%{?el6} BuildRequires: gettext-devel %else @@ -340,8 +342,8 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %files -%license copying.txt LICENSE.GPL -%doc CONTRIBUTING.md README.md docs +%license LICENSE.md LICENSES/ +%doc README.md docs %{_bindir}/kodi %{_bindir}/kodi-standalone %{_bindir}/TexturePacker @@ -360,7 +362,7 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %files eventclients -%license copying.txt LICENSE.GPL +%license LICENSE.md LICENSES/ %{python2_sitelib}/kodi %dir %{_datadir}/pixmaps/kodi %{_datadir}/pixmaps/kodi/*.png @@ -377,13 +379,16 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %files firewalld -%license copying.txt LICENSE.GPL +%license LICENSE.md LICENSES/ %{_prefix}/lib/firewalld/services/kodi-eventserver.xml %{_prefix}/lib/firewalld/services/kodi-http.xml %{_prefix}/lib/firewalld/services/kodi-jsonrpc.xml %changelog +* Tue Aug 28 2018 Michael Cronenworth <mike(a)cchtml.com&gt; - 18.0-0.5.b1 +- Kodi 18.0 beta 1 v2 + * Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 18.0-0.4.a2 - Rebuilt for Fedora 29 Mass Rebuild binutils issue diff --git a/sources b/sources index 92bd9d8..8075ee6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b1f494c5e58ad35c411212939028f483 kodi-18.0a2-patched.tar.xz -812975261bc196ecd8a8b1978802f8ba kodi-libdvdnav-6.0.0-Leia-Alpha-1.tar.gz -1b0858777b40305837925356d7d5fb52 kodi-libdvdread-6.0.0-Leia-Alpha-1.tar.gz +1708584c564024241b32ff67bd566966 kodi-18.0b1v2-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