commit 351c5dab401248ab5dc81bf8ac83b440968617ce Author: Michael Cronenworth <mike(a)cchtml.com&gt; Date: Tue Jan 17 09:07:09 2017 -0600 Update to 17.0 RC3 .gitignore | 1 + kodi-17.0rc3-AEDefines.patch | 21 +++++++++++++++++++++ kodi-generate-tarball-xz.sh | 2 +- kodi.spec | 23 +++++++++++++++++++---- sources | 2 +- 5 files changed, 43 insertions(+), 6 deletions(-) --- diff --git a/.gitignore b/.gitignore index 38f63d5..4adc183 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /kodi-17.0rc1-patched.tar.xz /kodi-17.0rc2-patched.tar.xz +/kodi-17.0rc3-patched.tar.xz diff --git a/kodi-17.0rc3-AEDefines.patch b/kodi-17.0rc3-AEDefines.patch new file mode 100644 index 0000000..e778fad --- /dev/null +++ b/kodi-17.0rc3-AEDefines.patch @@ -0,0 +1,21 @@ +From db26dd8f619d76cf459b87c2e003e3cd33b96b79 Mon Sep 17 00:00:00 2001 +From: fritsch <Peter.Fruehberger(a)gmail.com&gt; +Date: Sun, 8 Jan 2017 20:09:21 +0100 +Subject: [PATCH] Autotools: Fake empty AE override + +--- + xbmc/cores/AudioEngine/Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xbmc/cores/AudioEngine/Makefile.in b/xbmc/cores/AudioEngine/Makefile.in +index 9a4e998..9a3d486 100644 +--- a/xbmc/cores/AudioEngine/Makefile.in ++++ b/xbmc/cores/AudioEngine/Makefile.in +@@ -83,6 +83,6 @@ SRCS += Utils/AELimiter.cpp + SRCS += Encoders/AEEncoderFFmpeg.cpp + + LIB = audioengine.a +- ++$(shell touch AEDefines_override.h) + include @abs_top_srcdir(a)/Makefile.include + -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS))) diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh index 57a464e..21527a6 100755 --- a/kodi-generate-tarball-xz.sh +++ b/kodi-generate-tarball-xz.sh @@ -1,7 +1,7 @@ #!/bin/sh MAJORVERSION=17 -MINORVERSION=0rc2 +MINORVERSION=0rc3 #GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96 #GITSHORT=ge988513 CODENAME=Krypton diff --git a/kodi.spec b/kodi.spec index c363cec..d52f2ae 100644 --- a/kodi.spec +++ b/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE rc2 +%global PRERELEASE rc3 #global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases @@ -38,6 +38,9 @@ Patch1: kodi-16.0-versioning.patch # Drop DVD library support Patch2: kodi-17a2-libdvd.patch +# Build issue, fixed upstream +Patch3: kodi-17.0rc3-AEDefines.patch + # Optional deps (not in EPEL) %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) @@ -257,6 +260,7 @@ library. %setup -q -n %{name}-%{DIRVERSION} %patch1 -p1 -b.versioning %patch2 -p1 -b.libdvd +%patch3 -p1 -b.aedefines %if 0%{?_with_dvd} cp -p %{SOURCE2} tools/depends/target/libdvdnav/libdvdnav-master.tar.gz cp -p %{SOURCE3} tools/depends/target/libdvdread/libdvdread-master.tar.gz @@ -323,6 +327,9 @@ desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/kodi.desktop +# Stop shipping the duplicate xsession file +rm -f $RPM_BUILD_ROOT/%{_datadir}/xsessions/xbmc.desktop + # Normally we are expected to build these manually. But since we are using # the system Python interpreter, we also want to use the system libraries install -d $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib @@ -352,7 +359,9 @@ fi %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : if [ ! -L %{_libdir}/xbmc ] ; then - rmdir %{_libdir}/xbmc %{_datadir}/xbmc + if [ -d %{_libdir}/xbmc ] ; then + rmdir %{_libdir}/xbmc %{_datadir}/xbmc + fi ln -s kodi ${RPM_BUILD_ROOT}%{_libdir}/xbmc ln -s kodi ${RPM_BUILD_ROOT}%{_datadir}/xbmc fi @@ -360,7 +369,9 @@ fi %posttrans devel if [ ! -L %{_includedir}/xbmc ] ; then - rmdir %{_includedir}/xbmc + if [ -d %{_includedir}/xbmc ] ; then + rmdir %{_includedir}/xbmc + fi ln -s kodi ${RPM_BUILD_ROOT}%{_includedir}/xbmc fi @@ -377,7 +388,6 @@ fi %{_datadir}/kodi %ghost %{_datadir}/xbmc %{_datadir}/xsessions/kodi.desktop -%{_datadir}/xsessions/xbmc.desktop %{_datadir}/applications/kodi.desktop %{_datadir}/icons/hicolor/*/*/*.png %{_mandir}/man1/kodi.1.gz @@ -410,6 +420,11 @@ fi %changelog +* Mon Jan 16 2017 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.0-0.12.rc3 +- Kodi 17 RC3 +- Check for new installs (RFBZ#4409) +- Drop the XBMC xsession file (RFBZ#4422) + * Wed Jan 04 2017 Michael Cronenworth <mike(a)cchtml.com&gt; - 17.0-0.11.rc2 - Kodi 17 RC2 diff --git a/sources b/sources index 8cfd057..616525d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -553c44196e3199298b2c62048d3c4f91 kodi-17.0rc2-patched.tar.xz +db0346baf7c745e7477782ae2443b8fc kodi-17.0rc3-patched.tar.xz