From 43ac3a72c2d577b0b04b52b49f4af4411d624398 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 11 Nov 2018 23:45:05 +0100 Subject: [PATCH 01/10] RC0 (git master branch) build --- fedora/SPECS/kodi.spec | 198 ++--------------------------------------- 1 file changed, 6 insertions(+), 192 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index f4269bd..9dd8d36 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE b4 +%global PRERELEASE rc0 #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.10.b4%{?dist} +Release: 0.10.%{PRERELEASE}%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -477,194 +477,8 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %changelog -* Thu Oct 11 2018 Nicolas Chauvet - 18.0-0.10.b3 -- Update to beta3 -- Enable arm build -- Build EGL/GLES everywhere -- Add firewalld sub-package when relevant +* Sat Nov 10 2018 Daniel Steiner - 18.0-0.10.rc0 +- Update to RC0 -* Thu Sep 27 2018 Michael Cronenworth - 18.0-0.9.b2 -- Kodi 18.0 beta 2 - -* Fri Aug 31 2018 Michael Cronenworth - 18.0-0.8.b1 -- Fix Requires and versioning in new split packages - -* Thu Aug 30 2018 Michael Cronenworth - 18.0-0.7.b1 -- Update Requires for new split packages - -* Tue Aug 28 2018 Michael Cronenworth - 18.0-0.6.b1 -- Build wayland and GBM binaries - -* Tue Aug 28 2018 Michael Cronenworth - 18.0-0.5.b1 -- Kodi 18.0 beta 1 v2 - -* Sun Aug 19 2018 Leigh Scott - 18.0-0.4.a2 -- Rebuilt for Fedora 29 Mass Rebuild binutils issue - -* Thu Jul 26 2018 RPM Fusion Release Engineering - 18.0-0.3.a2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Sun Jun 24 2018 Michael Cronenworth - 18.0-0.2.a2 -- Kodi 18.0 alpha 2 - -* Thu May 03 2018 Michael Cronenworth - 18.0-0.1.a1 -- Add patch to fix assert on start. - -* Fri Mar 16 2018 Michael Cronenworth - 18.0-0.0.a1 -- Kodi 18.0 alpha 1 - -* Thu Mar 08 2018 RPM Fusion Release Engineering - 17.6-7 -- Rebuilt for new ffmpeg snapshot - -* Thu Mar 01 2018 RPM Fusion Release Engineering - 17.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Feb 06 2018 Leigh Scott - 17.6-5 -- Rebuild for boost-1.66 - -* Wed Jan 24 2018 Michael Cronenworth - 17.6-4 -- ffmpeg-3.5 support -- Make dvd support an rpm build conditional - -* Thu Jan 18 2018 Leigh Scott - 17.6-3 -- Rebuilt for ffmpeg-3.5 git - -* Mon Jan 15 2018 Nicolas Chauvet - 17.6-2 -- Rebuilt for VA-API 1.0.0 - -* Fri Nov 17 2017 Michael Cronenworth - 17.6-1 -- Kodi 17.6 final - -* Wed Oct 25 2017 Michael Cronenworth - 17.5-1 -- Kodi 17.5 final - -* Wed Aug 23 2017 Michael Cronenworth - 17.4-1 -- Kodi 17.4 final - -* Wed May 31 2017 Michael Cronenworth - 17.3-1 -- Kodi 17.3 final - -* Wed May 24 2017 Michael Cronenworth - 17.2-1 -- Kodi 17.2 final - -* Sat Apr 29 2017 Leigh Scott - 17.1-2 -- Rebuild for ffmpeg update - -* Tue Mar 28 2017 Michael Cronenworth - 17.1-1 -- Kodi 17.1 final - -* Sun Mar 19 2017 RPM Fusion Release Engineering - 17.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 02 2017 Michael Cronenworth - 17.0-1 -- Kodi 17.0 final - -* Fri Jan 27 2017 Michael Cronenworth - 17.0-0.12.rc4 -- Kodi 17 RC4 - -* Mon Jan 16 2017 Michael Cronenworth - 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 - 17.0-0.11.rc2 -- Kodi 17 RC2 - -* Thu Dec 29 2016 Michael Cronenworth - 17.0-0.11.rc1 -- Kodi 17 RC1 - -* Mon Dec 19 2016 Michael Cronenworth - 17.0-0.10 -- Kodi 17 beta 7 - -* Sun Dec 11 2016 Michael Cronenworth - 17.0-0.9 -- Kodi 17 beta 6 -- Drop libcec patch, now upstream - -* Mon Oct 31 2016 Michael Cronenworth - 17.0-0.8 -- Kodi 17 beta 5 -- Include patch for libcec 4.0 support -- Drop ARM support - -* Mon Oct 10 2016 Michael Cronenworth - 17.0-0.7 -- Kodi 17 beta 3 - -* Mon Sep 19 2016 Michael Cronenworth - 17.0-0.6 -- Kodi 17 beta 2 - -* Fri Aug 26 2016 Michael Cronenworth - 17.0-0.5 -- Kodi 17 beta 1 - -* Fri Aug 05 2016 Michael Cronenworth - 17.0-0.4 -- Kodi 17 alpha 3 - -* Sun Jul 31 2016 Julian Sikorski - 17.0-0.3 -- Rebuilt for ffmpeg-3.1.1 -- Fixed the verbose build -- Ensured $RPM_LD_FLAGS are used - -* Tue Jul 05 2016 Michael Cronenworth - 17.0-0.2 -- Kodi 17.0 alpha 2 - -* Wed Jun 22 2016 Michael Cronenworth - 17.0-0.1 -- Kodi 17.0 alpha 1 - -* Mon Apr 25 2016 Michael Cronenworth - 16.1-1 -- Kodi 16.1 final - -* Sat Feb 20 2016 Michael Cronenworth - 16.0-1 -- Kodi 16.0 final - -* Fri Jan 22 2016 Michael Cronenworth - 16.0-0.2 -- Kodi 16.0 RC1 - -* Sun Dec 06 2015 Michael Cronenworth - 16.0-0.1 -- Kodi 16.0 beta 3 -- Drop libhdhomerun support (dropped by Kodi) - -* Wed Nov 25 2015 Michael Cronenworth - 15.2-3 -- Enable AirPlay support (shairplay library) - -* Sat Oct 24 2015 Michael Cronenworth - 15.2-2 -- Enable NFS client support - -* Thu Oct 22 2015 Michael Cronenworth - 15.2-1 -- Kodi 15.2 final - -* Sun Aug 16 2015 Michael Cronenworth - 15.1-1 -- Kodi 15.1 final - -* Wed Jul 22 2015 Michael Cronenworth - 15.0-1 -- Kodi 15.0 final - -* Tue Jun 16 2015 Michael Cronenworth - 15.0-0.1 -- Kodi 15.0 beta 2 - -* Fri May 22 2015 Michael Cronenworth - 14.2-2 -- GCC5 fixes - -* Sun Mar 29 2015 Michael Cronenworth - 14.2-1 -- Update to 14.2 final -- Build with SDL2 to enable joystick support - -* Fri Jan 30 2015 Michael Cronenworth - 14.1-1 -- Update to 14.1 final -- Fix Obsoletes for -devel - -* Mon Jan 05 2015 Michael Cronenworth - 14.0-2 -- Fix xbmc upgrade path - -* Sun Dec 28 2014 Michael Cronenworth - 14.0-1 -- Update to 14.0 final - -* Tue Dec 09 2014 Michael Cronenworth - 14.0-0.4.rc3 -- Update to 14.0 RC3 - -* Sun Nov 09 2014 Michael Cronenworth - 14.0-0.3.beta2 -- Update to 14.0 beta 2 - -* Tue Sep 02 2014 Michael Cronenworth - 14.0-0.2.alpha3 -- Update to 14.0 alpha 3 - -* Sun Aug 24 2014 Michael Cronenworth - 14.0-0.1.alpha2 -- Update to 14.0 alpha 2 -- Renamed XBMC to Kodi +* Sun Nov 4 2018 Daniel Steiner - 18.0-0.10.b5 +- Update to beta5 From 803d1f66125a3355058beefc05ab233a7ec160f9 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 12 Nov 2018 00:01:11 +0100 Subject: [PATCH 02/10] New htop v3 Beta 5 package --- fedora/SPECS/htop.spec | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 fedora/SPECS/htop.spec diff --git a/fedora/SPECS/htop.spec b/fedora/SPECS/htop.spec new file mode 100644 index 0000000..333fe38 --- /dev/null +++ b/fedora/SPECS/htop.spec @@ -0,0 +1,44 @@ +Name: htop +Version: 3.0.0beta5 +Release: 1%{?dist} +Summary: System Top + +Group: System +License: GPL +URL: https://hisham.hm/htop/ +SOURCE0: %name-%version.tar.gz + +BuildRequires: gcc +BuildRequires: ncurses-devel + +%description +This is htop, an interactive process viewer. It requires ncurses. It is developed primarily on Linux, but we also have code for running under FreeBSD and Mac OS X (help and testing are wanted for these platforms!) + +This software has evolved considerably over the years, and is reasonably complete, but there is always room for improvement. + + +%prep +%setup -q + + +%build +./autogen.sh +%configure +make %{?_smp_mflags} + + +%install +make install DESTDIR=%{buildroot} + + +%files +%doc AUTHORS COPYING ChangeLog INSTALL NEWS TESTPLAN +%{_bindir}/htop +%{_datarootdir}/applications/htop.desktop +%{_mandir}/man1 +%{_mandir}/man1/htop.1.gz +%{_datarootdir}/pixmaps/htop.png + + +%changelog + From 7e48c649f512825c89cea6962307fdba96d9d1af Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Mon, 12 Nov 2018 00:21:48 +0100 Subject: [PATCH 03/10] Build from master branch --- fedora/SPECS/htop.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/htop.spec b/fedora/SPECS/htop.spec index 333fe38..73ba773 100644 --- a/fedora/SPECS/htop.spec +++ b/fedora/SPECS/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 3.0.0beta5 +Version: 3.0.0 Release: 1%{?dist} Summary: System Top @@ -41,4 +41,6 @@ make install DESTDIR=%{buildroot} %changelog +* Sun Nov 11 2018 Daniel Steiner - 3.0.0 +- htop build from master branch (3.0.0) From 1f65c9de3d544f178c15c7c25a17807d7e4d7617 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Fri, 16 Nov 2018 21:22:22 +0100 Subject: [PATCH 04/10] Update makemkv to 1.14.1 --- fedora/SPECS/makemkv.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/makemkv.spec b/fedora/SPECS/makemkv.spec index 0870db9..91ee746 100644 --- a/fedora/SPECS/makemkv.spec +++ b/fedora/SPECS/makemkv.spec @@ -3,7 +3,7 @@ # Name: makemkv -Version: 1.10.8 +Version: 1.14.1 Release: 0%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: One click DVD and Blu-ray converter @@ -83,6 +83,9 @@ popd %{_datarootdir}/MakeMKV/* %changelog +* Fri Nov 16 2018 Daniel Steiner +- Update to 1.14.1. + * Fri Jan 5 2018 Daniel Steiner - Update to 1.10.8. From 05c1c9dcc1ecbfa758860d6bbcbccdd7d30cbdeb Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 17 Nov 2018 10:33:21 +0100 Subject: [PATCH 05/10] Merged kodi file --- fedora/SPECS/kodi.spec.orig | 491 ++++++++++++++++++++++++++++++++++++ 1 file changed, 491 insertions(+) create mode 100644 fedora/SPECS/kodi.spec.orig diff --git a/fedora/SPECS/kodi.spec.orig b/fedora/SPECS/kodi.spec.orig new file mode 100644 index 0000000..b617ac2 --- /dev/null +++ b/fedora/SPECS/kodi.spec.orig @@ -0,0 +1,491 @@ +<<<<<<< HEAD +%global PRERELEASE rc0 +======= +%global PRERELEASE b5 +>>>>>>> Update to Kodi Leia Beta 5 +#global DIRVERSION %{version} +#global GITCOMMIT Gotham_r2-ge988513 +# use the line below for pre-releases +%global DIRVERSION %{version}%{PRERELEASE} +%global _hardened_build 1 + +# We support hte following options: +# --with, +# * dvdcss - Include DVD decryption support +# +# Default: Do not ship DVD decryption for legal reasons +%bcond_with dvdcss + +# Optional deps (not in EPEL) +%if 0%{?fedora} +# (libbluray in EPEL 6 is too old.) +%global _with_libbluray 1 +%global _with_cwiid 1 +%global _with_libssh 1 +%global _with_libcec 1 +%global _with_external_ffmpeg 1 +%global _with_wayland 1 +%endif +%if 0%{?_with_wayland} +%global kodi_backends x11 wayland gbm +%else +%global kodi_backends x11 gbm +%endif + +Name: kodi +Version: 18.0 +Release: 0.10.%{PRERELEASE}%{?dist} +Summary: Media center + +License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT +# Main binary and all supporting files are GPLv2+/GPLv3+ +# Some supporting libraries use the LGPL / BSD / MIT license +Group: Applications/Multimedia +URL: http://www.kodi.tv/ +Source0: %{name}-%{DIRVERSION}-patched.tar.xz +# kodi contains code that we cannot ship, as well as redundant private +# copies of upstream libraries that we already distribute. Therefore +# we use this script to remove the code before shipping it. +# Invoke this script while in the directory where the tarball is located: +# ./kodi-generate-tarball-xz.sh +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-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-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-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 +Patch1: kodi-18.0-versioning.patch + +# fix assert at startup +Patch2: kodi-18a1-assert.patch + +%ifarch x86_64 i686 +%global _with_crystalhd 1 +%endif + +# Upstream does not support ppc64 +ExcludeArch: %{power64} ppc64le + +BuildRequires: SDL2-devel +BuildRequires: SDL_image-devel +BuildRequires: a52dec-devel +BuildRequires: afpfs-ng-devel +BuildRequires: avahi-devel +BuildRequires: bluez-libs-devel +BuildRequires: boost-devel +BuildRequires: bzip2-devel +BuildRequires: cmake +BuildRequires: crossguid-devel +%if 0%{?_with_cwiid} +BuildRequires: cwiid-devel +%endif +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: e2fsprogs-devel +BuildRequires: enca-devel +BuildRequires: expat-devel +BuildRequires: faad2-devel +BuildRequires: firewalld-filesystem +%if 0%{?_with_external_ffmpeg} +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 +BuildRequires: gettext-autopoint +%endif +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: giflib-devel +BuildRequires: glew-devel +BuildRequires: glib2-devel +BuildRequires: gperf +BuildRequires: jasper-devel +BuildRequires: java-devel +BuildRequires: lame-devel +BuildRequires: lcms2-devel +BuildRequires: libXinerama-devel +BuildRequires: libXmu-devel +BuildRequires: libXtst-devel +BuildRequires: libass-devel >= 0.9.7 +%if 0%{?_with_libbluray} +BuildRequires: libbluray-devel +%endif +BuildRequires: libcap-devel +BuildRequires: libcdio-devel +%if 0%{?_with_libcec} +%if 0%{?fedora} > 24 +BuildRequires: libcec-devel >= 4.0.0 +%else +BuildRequires: libcec-devel < 4.0.0 +%endif +%endif +%if 0%{?_with_crystalhd} +BuildRequires: libcrystalhd-devel +%endif +BuildRequires: libcurl-devel +BuildRequires: libdca-devel +BuildRequires: libidn2-devel +BuildRequires: libinput-devel +%if 0%{?el6} +BuildRequires: libjpeg-devel +%else +BuildRequires: libjpeg-turbo-devel +%endif +BuildRequires: libmad-devel +BuildRequires: libmicrohttpd-devel +BuildRequires: libmms-devel +BuildRequires: libmodplug-devel +BuildRequires: libmpcdec-devel +BuildRequires: libmpeg2-devel +BuildRequires: libnfs-devel +BuildRequires: libogg-devel +# for AirPlay support +BuildRequires: shairplay-devel +BuildRequires: libplist-devel +BuildRequires: libpng-devel +BuildRequires: librtmp-devel +BuildRequires: libsamplerate-devel +BuildRequires: libsmbclient-devel +%if 0%{?_with_libssh} +BuildRequires: libssh-devel +%endif +BuildRequires: libtiff-devel +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: libva-devel +BuildRequires: libvdpau-devel +BuildRequires: libvorbis-devel +%if 0%{?_with_wayland} +BuildRequires: libxkbcommon-devel +%endif +BuildRequires: libxml2-devel +BuildRequires: libxslt-devel +BuildRequires: lzo-devel +BuildRequires: mariadb-devel +BuildRequires: mesa-libEGL-devel +BuildRequires: mesa-libGLES-devel +BuildRequires: mesa-libgbm-devel +BuildRequires: nasm +BuildRequires: pcre-devel +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 +BuildRequires: systemd-devel +BuildRequires: taglib-devel >= 1.10 +BuildRequires: tinyxml-devel +BuildRequires: tre-devel +BuildRequires: trousers-devel +BuildRequires: wavpack-devel +%if 0%{?_with_wayland} +BuildRequires: wayland-protocols-devel +BuildRequires: waylandpp-devel +%endif +BuildRequires: yajl-devel +BuildRequires: zlib-devel + +# Install major backends, users can remove them individually +Requires: %{name}-common = %{version}-%{release} +Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server) +Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg) +Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) + + +%description +Kodi is a free cross-platform media-player jukebox and entertainment hub. +Kodi can play a spectrum of of multimedia formats, and featuring playlist, +audio visualizations, slideshow, and weather forecast functions, together +third-party plugins. + +This is a meta package. + + +%package common +Summary: Common Kodi files and binaries +Requires: dejavu-sans-fonts +# need explicit requires for these packages +# as they are dynamically loaded via XBMC's arcane +# pseudo-DLL loading scheme (sigh) +%if 0%{?_with_libbluray} +Requires: libbluray%{?_isa} +%endif +%if 0%{?_with_libcec} +%if 0%{?fedora} > 24 +Requires: libcec%{?_isa} >= 4.0.0 +%else +Requires: libcec%{?_isa} < 4.0.0 +%endif +%endif +%if 0%{?_with_crystalhd} +Requires: libcrystalhd%{?_isa} +%endif +Requires: libmad%{?_isa} +Requires: librtmp%{?_isa} +Requires: shairplay-libs%{?_isa} + +# needed when doing a minimal install, see +# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844 +Requires: glx-utils +Requires: xorg-x11-utils + +# This is just symlinked to, but needed both at build-time +# and for installation +Requires: python2-pillow%{?_isa} + +%description common +Common Kodi files and binaries + + +%package devel +Summary: Development files needed to compile C programs against kodi +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: xbmc-devel < 14.0 +Provides: xbmc-devel = %{version} + +%description devel +Kodi is a free cross-platform media-player jukebox and entertainment hub. +If you want to develop programs which use Kodi's libraries, you need to +install this package. + + +%package eventclients +Summary: Media center event client remotes +Obsoletes: xbmc-eventclients < 14.0 +Provides: xbmc-eventclients = %{version} + +%description eventclients +This package contains support for using Kodi with the PS3 Remote, the Wii +Remote, a J2ME based remote and the command line xbmc-send utility. + +%package eventclients-devel +Summary: Media center event client remotes development files +Requires: %{name}-eventclients%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Obsoletes: xbmc-eventclients-devel < 14.0 +Provides: xbmc-eventclients-devel = %{version} + +%description eventclients-devel +This package contains the development header files for the eventclients +library. + + +%package firewalld +Summary: FirewallD metadata files for Kodi +Requires: firewalld-filesystem +Requires(post): firewalld-filesystem + +%description firewalld +This package contains FirewallD files for Kodi. + + +%package gbm +Summary: Kodi binary for Generic Buffer Management +Requires: %{name}-common = %{version}-%{release} + + +%description gbm +This package contains the Kodi binary for Generic Buffer Management. + + +%package wayland +Summary: Kodi binary for Wayland compositors +Requires: %{name}-common = %{version}-%{release} + + +%description wayland +This package contains the Kodi binary for Wayland compositors. + + +%package x11 +Summary: Kodi binary for X11 servers +Requires: %{name}-common = %{version}-%{release} + + +%description x11 +This package contains the Kodi binary for X11 servers. + + +%prep +%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 +mkdir {fedora-gbm,fedora-wayland,fedora-x11} + +for BACKEND in %{kodi_backends} +do + pushd fedora-$BACKEND +%cmake \ +%if %{with dvdcss} + -DLIBDVDCSS_URL=%{SOURCE4} \ +%else + -DENABLE_DVDCSS=OFF \ +%endif +%if ! 0%{?_with_external_ffmpeg} + -DFFMPEG_URL=%{SOURCE5} \ +%endif + -DENABLE_EVENTCLIENTS=ON \ + -DENABLE_INTERNAL_CROSSGUID=OFF \ + -DLIRC_DEVICE=/var/run/lirc/lircd \ + -DLIBDVDNAV_URL=%{SOURCE2} \ + -DLIBDVDREAD_URL=%{SOURCE3} \ + -DPYTHON_EXECUTABLE=%{__python2} \ + -DCORE_PLATFORM_NAME=$BACKEND \ +%ifarch x86_64 i686 + -DWAYLAND_RENDER_SYSTEM=gl \ + -DGBM_RENDER_SYSTEM=gl \ +%else + -DWAYLAND_RENDER_SYSTEM=gles \ + -DGBM_RENDER_SYSTEM=gles \ +%endif + ../ + cmake --build . -- VERBOSE=1 %{?_smp_mflags} + popd +done + + +%install +for BACKEND in %{kodi_backends} +do + pushd fedora-$BACKEND + make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install + popd +done + +# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir +rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ + +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 +ln -s %{python2_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL +#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib +#ln -s %{python2_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 + +# Use external font files instead of bundled ones +ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/ + +# Move man-pages into system dir +mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ +mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ + + +%post firewalld +%firewalld_reload + + +%files + + +%files common +%license LICENSE.md LICENSES/ +%doc README.md docs +%{_bindir}/kodi +%{_bindir}/kodi-standalone +%{_bindir}/TexturePacker +%dir %{_libdir}/kodi/ +%{_libdir}/kodi/addons/ +%{_libdir}/kodi/system/ +%{_datadir}/kodi/ +%{_datadir}/xsessions/kodi.desktop +%{_datadir}/applications/kodi.desktop +%{_datadir}/icons/hicolor/*/*/*.png +%{_mandir}/man1/kodi.1.gz +%{_mandir}/man1/kodi.bin.1.gz +%{_mandir}/man1/kodi-standalone.1.gz + + +%files devel +%{_includedir}/kodi + + +%files eventclients +%license LICENSE.md LICENSES/ +%{python2_sitelib}/kodi +%dir %{_datadir}/pixmaps/kodi +%{_datadir}/pixmaps/kodi/*.png +%{_bindir}/kodi-ps3remote +%{_bindir}/kodi-send +%{_bindir}/kodi-wiiremote +%{_mandir}/man1/kodi-ps3remote.1.gz +%{_mandir}/man1/kodi-send.1.gz +%{_mandir}/man1/kodi-wiiremote.1.gz + + +%files eventclients-devel +%{_includedir}/kodi/xbmcclient.h + + +%files firewalld +%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 + + +%files gbm +%{_libdir}/kodi/kodi-gbm + + +%files wayland +%{_libdir}/kodi/kodi-wayland + + +%files x11 +%{_libdir}/kodi/kodi-x11 +%{_libdir}/kodi/kodi-xrandr + + +%changelog +<<<<<<< HEAD +* Sat Nov 10 2018 Daniel Steiner - 18.0-0.10.rc0 +- Update to RC0 + +======= +>>>>>>> Update to Kodi Leia Beta 5 +* Sun Nov 4 2018 Daniel Steiner - 18.0-0.10.b5 +- Update to beta5 From 58ee2af0616c15e7ecf88bcd43bbc0b6fdf98cbf Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 4 Nov 2018 09:12:54 +0100 Subject: [PATCH 06/10] Update to Kodi Leia Beta 5 --- fedora/SPECS/kodi.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 9dd8d36..7bc10bc 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE rc0 +%global PRERELEASE b5 #global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases @@ -477,8 +477,5 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %changelog -* Sat Nov 10 2018 Daniel Steiner - 18.0-0.10.rc0 -- Update to RC0 - * Sun Nov 4 2018 Daniel Steiner - 18.0-0.10.b5 - Update to beta5 From 174dfd4ca73b51dc9eaad683b186e56bbc00f4dd Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sun, 4 Nov 2018 14:50:02 +0100 Subject: [PATCH 07/10] htop updated to beta version. New git 2.x package, dependency for gitea --- centos/SPECS/git.spec | 576 +++++++++++++++++++++++++++++++++++++++++ centos/SPECS/htop.spec | 3 +- 2 files changed, 578 insertions(+), 1 deletion(-) create mode 100644 centos/SPECS/git.spec diff --git a/centos/SPECS/git.spec b/centos/SPECS/git.spec new file mode 100644 index 0000000..dc6d1a7 --- /dev/null +++ b/centos/SPECS/git.spec @@ -0,0 +1,576 @@ +# Pass --without docs to rpmbuild if you don't want the documentation + +# Settings for EL-5 +# - Leave git-* binaries in %{_bindir} +# - Don't use noarch subpackages +# - Use proper libcurl devel package +# - Explicitly enable ipv6 for git-daemon +# - Use prebuilt documentation, asciidoc is too old +# - Define missing python macro +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global gitcoredir %{_bindir} +%global noarch_sub 0 +%global libcurl_devel curl-devel +%global docbook_suppress_sp 1 +%global enable_ipv6 1 +%global use_prebuilt_docs 1 +%global filter_yaml_any 1 +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%else +%global gitcoredir %{_libexecdir}/git-core +%global noarch_sub 1 +%global libcurl_devel libcurl-devel +%global docbook_suppress_sp 0 +%global enable_ipv6 0 +%global use_prebuilt_docs 0 +%global filter_yaml_any 0 +%endif + +# Use systemd instead of xinetd on Fedora 19+ and RHEL 7+ +%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 +%global use_systemd 1 +%else +%global use_systemd 0 +%endif + +# Build gnome-keyring git-credential helper on Fedora and RHEL >= 7 +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global gnome_keyring 1 +%else +%global gnome_keyring 0 +%endif + +%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7) +%global with_desktop_vendor_tag 1 +%else +%global with_desktop_vendor_tag 0 +%endif + +Name: git +Version: 2.19.1 +Release: 1%{?dist} +Summary: Fast Version Control System +License: GPLv2 +Group: Development/Tools +URL: http://git-scm.com/ +Source0: http://git-core.googlecode.com/files/%{name}-%{version}.tar.gz +Source2: git-init.el +Source3: git.xinetd.in +Source4: git.conf.httpd +Source5: git-gui.desktop +Source6: gitweb.conf.in +Source10: https://cdn.kernel.org/pub/software/scm/git/%{name}-manpages-%{version}.tar.gz +Source11: https://cdn.kernel.org/pub/software/scm/git/%{name}-htmldocs-%{version}.tar.gz +Source12: git@.service +Source13: git.socket +Patch0: git-1.5-gitweb-home-link.patch +# https://bugzilla.redhat.com/490602 +Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +BuildRequires: asciidoc >= 8.4.1 +BuildRequires: xmlto +%endif +BuildRequires: desktop-file-utils +BuildRequires: expat-devel +BuildRequires: gettext +BuildRequires: %{libcurl_devel} +%if %{gnome_keyring} +BuildRequires: libgnome-keyring-devel +%endif +BuildRequires: pcre2-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel >= 1.2 +%if %{use_systemd} +# For macros +BuildRequires: systemd +%endif + +Requires: less +Requires: openssh-clients +Requires: perl(Error) +Requires: perl(Term::ReadKey) +Requires: perl-Git = %{version}-%{release} +Requires: rsync +Requires: zlib >= 1.2 + +Provides: git-core = %{version}-%{release} +Obsoletes: git-core <= 1.5.4.3 + +# Obsolete git-arch +Obsoletes: git-arch < %{version}-%{release} + +%description +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +The git rpm installs the core tools with minimal dependencies. To +install all git packages, including tools for integrating with other +SCMs, install the git-all meta-package. + +%package all +Summary: Meta-package to pull in all git tools +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: git-cvs = %{version}-%{release} +Requires: git-email = %{version}-%{release} +Requires: git-gui = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: git-p4 = %{version}-%{release} +Requires: gitk = %{version}-%{release} +Requires: perl-Git = %{version}-%{release} +Obsoletes: git <= 1.5.4.3 + +%description all +Git is a fast, scalable, distributed revision control system with an +unusually rich command set that provides both high-level operations +and full access to internals. + +This is a dummy package which brings in all subpackages. + +%package bzr +Summary: Git tools for working with bzr repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: bzr + +%description bzr +%{summary}. + +%package daemon +Summary: Git protocol dæmon +Group: Development/Tools +Requires: git = %{version}-%{release} +%if %{use_systemd} +Requires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%else +Requires: xinetd +%endif +%description daemon +The git dæmon for supporting git:// access to git repositories + +%package -n gitweb +Summary: Simple web interface to git repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} + +%description -n gitweb +Simple web interface to track changes in git repositories + +%package hg +Summary: Git tools for working with mercurial repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: mercurial + +%description hg +%{summary}. + +%package p4 +Summary: Git tools for working with Perforce depots +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +BuildRequires: python +Requires: git = %{version}-%{release} +%description p4 +%{summary}. + +%package svn +Summary: Git tools for importing Subversion repositories +Group: Development/Tools +Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) +%description svn +Git tools for importing Subversion repositories. + +%package cvs +Summary: Git tools for importing CVS repositories +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release}, cvs +Requires: cvsps +Requires: perl-DBD-SQLite +%description cvs +Git tools for importing CVS repositories. + +%package email +Summary: Git tools for sending email +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} +Requires: perl(Authen::SASL) +Requires: perl(Net::SMTP::SSL) +%description email +Git tools for sending email. + +%package gui +Summary: Git GUI tool +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release}, tk >= 8.4 +Requires: gitk = %{version}-%{release} +%description gui +Git GUI tool. + +%package -n gitk +Summary: Git revision tree visualiser +Group: Development/Tools +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release}, tk >= 8.4 +%description -n gitk +Git revision tree visualiser. + +%package -n perl-Git +Summary: Perl interface to Git +Group: Development/Libraries +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +BuildRequires: perl(Error), perl(ExtUtils::MakeMaker) +Requires: perl(Error) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description -n perl-Git +Perl interface to Git. + +%package -n perl-Git-SVN +Summary: Perl interface to Git::SVN +Group: Development/Libraries +%if %{noarch_sub} +BuildArch: noarch +%endif +Requires: git = %{version}-%{release} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) + +%description -n perl-Git-SVN +Perl interface to Git. + +%prep +%setup -q +%patch1 -p1 + +%if %{use_prebuilt_docs} +mkdir -p prebuilt_docs/{html,man} +tar xf %{SOURCE10} -C prebuilt_docs/man +tar xf %{SOURCE11} -C prebuilt_docs/html +# Remove non-html files +find prebuilt_docs/html -type f ! -name '*.html' | xargs rm +find prebuilt_docs/html -type d | xargs rmdir --ignore-fail-on-non-empty +%endif + +# Use these same options for every invocation of 'make'. +# Otherwise it will rebuild in %%install due to flags changes. +cat << \EOF > config.mak +V = 1 +CFLAGS = %{optflags} +BLK_SHA1 = 1 +NEEDS_CRYPTO_WITH_SSL = 1 +USE_LIBPCRE = 1 +ETC_GITCONFIG = %{_sysconfdir}/gitconfig +DESTDIR = %{buildroot} +INSTALL = install -p +GITWEB_PROJECTROOT = %{_var}/lib/git +GNU_ROFF = 1 +htmldir = %{_docdir}/%{name}-%{version} +prefix = %{_prefix} +gitwebdir = %{_var}/www/git +EOF + +%if "%{gitcoredir}" == "%{_bindir}" +echo gitexecdir = %{_bindir} >> config.mak +%endif + +%if %{docbook_suppress_sp} +# This is needed for 1.69.1-1.71.0 +echo DOCBOOK_SUPPRESS_SP = 1 >> config.mak +%endif + +# Filter bogus perl requires +# packed-refs comes from a comment in contrib/hooks/update-paranoid +# YAML::Any is optional and not available on el5 +cat << \EOF > %{name}-req +#!/bin/sh +%{__perl_requires} $* |\ +sed \ +%if %{filter_yaml_any} + -e '/perl(YAML::Any)/d' \ +%endif + -e '/perl(packed-refs)/d' +EOF + +%global __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req +chmod +x %{__perl_requires} + +%build +sh configure +make %{?_smp_mflags} git-daemon LDFLAGS="-pie -Wl,-z,relro,-z,now" CFLAGS="$RPM_OPT_FLAGS -fPIC" +make %{?_smp_mflags} all -o git-daemon +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +make %{?_smp_mflags} doc +%endif + +%if %{gnome_keyring} +make -C contrib/credential/gnome-keyring/ +%endif + +make -C contrib/subtree/ + +# Remove shebang from bash-completion script +sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash + +%install +rm -rf %{buildroot} +make %{?_smp_mflags} INSTALLDIRS=vendor install -o git-daemon +%if ! %{use_prebuilt_docs} && ! 0%{?_without_docs} +make %{?_smp_mflags} INSTALLDIRS=vendor install-doc -o git-daemon +%else +cp -a prebuilt_docs/man/* %{buildroot}%{_mandir} +cp -a prebuilt_docs/html/* Documentation/ +%endif + +%if %{gnome_keyring} +install -pm 755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + %{buildroot}%{gitcoredir} +# Remove built binary files, otherwise they will be installed in doc +make -C contrib/credential/gnome-keyring/ clean +%endif + +make -C contrib/subtree install +%if ! %{use_prebuilt_docs} +make -C contrib/subtree install-doc +%endif + +mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d +install -pm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf +sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ + %{SOURCE6} > %{buildroot}%{_sysconfdir}/gitweb.conf + +find %{buildroot} -type f -name .packlist -exec rm -f {} ';' +find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' +find %{buildroot} -type f -name perllocal.pod -exec rm -f {} ';' + +# Remove remote-helper python libraries and scripts, these are not ready for +# use yet +rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgit + +# git-archimport is not supported +find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';' + +exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|gitk|p4|svn" +(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files +(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files +(find %{buildroot}%{perl_privlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files +(find %{buildroot}%{perl_privlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files +# Split out Git::SVN files +grep Git/SVN perl-git-files > perl-git-svn-files +sed -i "/Git\/SVN/ d" perl-git-files +%if %{!?_without_docs:1}0 +(find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files +%else +rm -rf %{buildroot}%{_mandir} +%endif + +mkdir -p %{buildroot}%{_var}/lib/git +%if %{use_systemd} +mkdir -p %{buildroot}%{_unitdir} +cp -a %{SOURCE12} %{SOURCE13} %{buildroot}%{_unitdir} +%else +mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d +# On EL <= 5, xinetd does not enable IPv6 by default +enable_ipv6=" # xinetd does not enable IPv6 by default + flags = IPv6" +perl -p \ + -e "s|\@GITCOREDIR\@|%{gitcoredir}|g;" \ + -e "s|\@BASE_PATH\@|%{_var}/lib/git|g;" \ +%if %{enable_ipv6} + -e "s|^}|$enable_ipv6\n$&|;" \ +%endif + %{SOURCE3} > %{buildroot}%{_sysconfdir}/xinetd.d/git +%endif + +# Install bzr and hg remote helpers from contrib +install -pm 755 contrib/remote-helpers/git-remote-{bzr,hg} %{buildroot}%{gitcoredir} + +# Setup bash completion +mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d +install -pm 644 contrib/completion/git-completion.bash %{buildroot}%{_sysconfdir}/bash_completion.d/git + +# Install tcsh completion +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-completion.tcsh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + +# Move contrib/hooks out of %%docdir and make them executable +mkdir -p %{buildroot}%{_datadir}/git-core/contrib +mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib +chmod +x %{buildroot}%{_datadir}/git-core/contrib/hooks/* +pushd contrib > /dev/null +ln -s ../../../git-core/contrib/hooks +popd > /dev/null + +# Install git-prompt.sh +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +install -pm 644 contrib/completion/git-prompt.sh \ + %{buildroot}%{_datadir}/git-core/contrib/completion/ + +# install git-gui .desktop file +desktop-file-install \ +%if %{with_desktop_vendor_tag} + --vendor fedora \ +%endif + --dir=%{buildroot}%{_datadir}/applications %{SOURCE5} + +# find translations +%find_lang %{name} %{name}.lang +cat %{name}.lang >> bin-man-doc-files + +# quiet some rpmlint complaints +chmod -R g-w %{buildroot} +find %{buildroot} -name git-mergetool--lib | xargs chmod a-x +rm -f {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore +chmod a-x Documentation/technical/api-index.sh +find contrib -type f | xargs chmod -x + + +%clean +rm -rf %{buildroot} + +%if %{use_systemd} +%post daemon +%systemd_post git@.service + +%preun daemon +%systemd_preun git@.service + +%postun daemon +%systemd_postun_with_restart git@.service +%endif + +%files -f bin-man-doc-files +%defattr(-,root,root) +%{_datadir}/git-core/ +%doc COPYING Documentation/*.txt Documentation/RelNotes contrib/ +%{!?_without_docs: %doc Documentation/*.html Documentation/docbook-xsl.css} +%{!?_without_docs: %doc Documentation/howto Documentation/technical} +%{_sysconfdir}/bash_completion.d + +%files bzr +%defattr(-,root,root) +%{gitcoredir}/git-remote-bzr + +%files hg +%defattr(-,root,root) +%{gitcoredir}/git-remote-hg + +%files p4 +%defattr(-,root,root) +%{gitcoredir}/*p4* +%{gitcoredir}/mergetools/p4merge +%doc Documentation/*p4*.txt +%{!?_without_docs: %{_mandir}/man1/*p4*.1*} +%{!?_without_docs: %doc Documentation/*p4*.html } + +%files svn +%defattr(-,root,root) +%{gitcoredir}/*svn* +%doc Documentation/*svn*.txt +%{!?_without_docs: %{_mandir}/man1/*svn*.1*} +%{!?_without_docs: %doc Documentation/*svn*.html } + +%files cvs +%defattr(-,root,root) +%doc Documentation/*git-cvs*.txt +%{_bindir}/git-cvsserver +%{gitcoredir}/*cvs* +%{!?_without_docs: %{_mandir}/man1/*cvs*.1*} +%{!?_without_docs: %doc Documentation/*git-cvs*.html } + +%files email +%defattr(-,root,root) +%doc Documentation/*email*.txt +%{gitcoredir}/*email* +%{!?_without_docs: %{_mandir}/man1/*email*.1*} +%{!?_without_docs: %doc Documentation/*email*.html } + +%files gui +%defattr(-,root,root) +%{gitcoredir}/git-gui* +%{gitcoredir}/git-citool +%{_datadir}/applications/*git-gui.desktop +%{_datadir}/git-gui/ +%{!?_without_docs: %{_mandir}/man1/git-gui.1*} +%{!?_without_docs: %doc Documentation/git-gui.html} +%{!?_without_docs: %{_mandir}/man1/git-citool.1*} +%{!?_without_docs: %doc Documentation/git-citool.html} + +%files -n gitk +%defattr(-,root,root) +%doc Documentation/*gitk*.txt +%{_bindir}/*gitk* +%{_datadir}/gitk +%{!?_without_docs: %{_mandir}/man1/*gitk*.1*} +%{!?_without_docs: %doc Documentation/*gitk*.html } + +%files -n perl-Git -f perl-git-files +%defattr(-,root,root) +%{!?_without_docs: %{_mandir}/man3/*Git*.3pm*} + +%files -n perl-Git-SVN -f perl-git-svn-files +%defattr(-,root,root) + +%files daemon +%defattr(-,root,root) +%doc Documentation/*daemon*.txt +%if %{use_systemd} +%{_unitdir}/git.socket +%{_unitdir}/git@.service +%else +%config(noreplace)%{_sysconfdir}/xinetd.d/git +%endif +%{gitcoredir}/git-daemon +%{_var}/lib/git +%{!?_without_docs: %{_mandir}/man1/*daemon*.1*} +%{!?_without_docs: %doc Documentation/*daemon*.html} + +%files -n gitweb +%defattr(-,root,root) +%doc gitweb/INSTALL gitweb/README +%config(noreplace)%{_sysconfdir}/gitweb.conf +%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf +%{_var}/www/git/ + + +%files all +# nothing + +%changelog +* Sun Nov 4 2018 Daniel Steiner +- Initial version 2.19.1 diff --git a/centos/SPECS/htop.spec b/centos/SPECS/htop.spec index 2c39f4c..2e61697 100644 --- a/centos/SPECS/htop.spec +++ b/centos/SPECS/htop.spec @@ -1,5 +1,5 @@ Name: htop -Version: 2.0.2 +Version: 3.0.0beta5 Release: 1%{?dist} Summary: System Top @@ -9,6 +9,7 @@ URL: http://someting SOURCE0: %name-%version.tar.gz BuildRequires: gcc +BuildRequires: ncurses-devel %description This is htop, an interactive process viewer. It requires ncurses. It is developed primarily on Linux, but we also have code for running under FreeBSD and Mac OS X (help and testing are wanted for these platforms!) From d414de874705bb287931d5e03e264c1a63ab1094 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 10 Nov 2018 16:57:22 +0100 Subject: [PATCH 08/10] Update to rc0 of kodi (master) --- fedora/SPECS/kodi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 7bc10bc..9dd8d36 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -1,4 +1,4 @@ -%global PRERELEASE b5 +%global PRERELEASE rc0 #global DIRVERSION %{version} #global GITCOMMIT Gotham_r2-ge988513 # use the line below for pre-releases @@ -477,5 +477,8 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ %changelog +* Sat Nov 10 2018 Daniel Steiner - 18.0-0.10.rc0 +- Update to RC0 + * Sun Nov 4 2018 Daniel Steiner - 18.0-0.10.b5 - Update to beta5 From 2fbc62fb9d96f439e241f71a01049e3c09fb5f46 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Tue, 13 Nov 2018 08:49:27 +0100 Subject: [PATCH 09/10] Gitea updated to RC1 --- centos/SPECS/gitea.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/centos/SPECS/gitea.spec b/centos/SPECS/gitea.spec index af698af..7f14369 100644 --- a/centos/SPECS/gitea.spec +++ b/centos/SPECS/gitea.spec @@ -1,8 +1,8 @@ Name: gitea Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Gitea is a painless self-hosted Git service. -%define MyVersion %version-rc1 +%define MyVersion %version-rc2 %define debug_package %{nil} License: MIT @@ -46,7 +46,7 @@ install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_unitdir}/gitea.service %files %defattr(0644,gitea,gitea,0755) %doc LICENSE -%attr (755,gitea,gitea) %{_sharedstatedir}/gitea +%dir %attr(755,gitea,gitea) %{_sharedstatedir}/gitea %attr(755,gitea,gitea) %{_sharedstatedir}/gitea/gitea %attr(0640,gitea,gitea) %config(noreplace) %{_sysconfdir}/gitea/gitea.ini %{_unitdir}/gitea.service @@ -66,5 +66,9 @@ getent passwd gitea > /dev/null || \ %changelog +* Tue Nov 13 2018 Daniel Steiner +- Update to RC1. + * Sun Oct 28 2018 Daniel Steiner - initial setup for CentOS 7. + From 42c154b77f57e4828b978333418ecead40a97a99 Mon Sep 17 00:00:00 2001 From: Daniel Steiner Date: Sat, 17 Nov 2018 09:12:29 +0100 Subject: [PATCH 10/10] kodi spec file conflict resolved --- fedora/SPECS/kodi.spec.orig | 491 ------------------------------------ 1 file changed, 491 deletions(-) delete mode 100644 fedora/SPECS/kodi.spec.orig diff --git a/fedora/SPECS/kodi.spec.orig b/fedora/SPECS/kodi.spec.orig deleted file mode 100644 index b617ac2..0000000 --- a/fedora/SPECS/kodi.spec.orig +++ /dev/null @@ -1,491 +0,0 @@ -<<<<<<< HEAD -%global PRERELEASE rc0 -======= -%global PRERELEASE b5 ->>>>>>> Update to Kodi Leia Beta 5 -#global DIRVERSION %{version} -#global GITCOMMIT Gotham_r2-ge988513 -# use the line below for pre-releases -%global DIRVERSION %{version}%{PRERELEASE} -%global _hardened_build 1 - -# We support hte following options: -# --with, -# * dvdcss - Include DVD decryption support -# -# Default: Do not ship DVD decryption for legal reasons -%bcond_with dvdcss - -# Optional deps (not in EPEL) -%if 0%{?fedora} -# (libbluray in EPEL 6 is too old.) -%global _with_libbluray 1 -%global _with_cwiid 1 -%global _with_libssh 1 -%global _with_libcec 1 -%global _with_external_ffmpeg 1 -%global _with_wayland 1 -%endif -%if 0%{?_with_wayland} -%global kodi_backends x11 wayland gbm -%else -%global kodi_backends x11 gbm -%endif - -Name: kodi -Version: 18.0 -Release: 0.10.%{PRERELEASE}%{?dist} -Summary: Media center - -License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT -# Main binary and all supporting files are GPLv2+/GPLv3+ -# Some supporting libraries use the LGPL / BSD / MIT license -Group: Applications/Multimedia -URL: http://www.kodi.tv/ -Source0: %{name}-%{DIRVERSION}-patched.tar.xz -# kodi contains code that we cannot ship, as well as redundant private -# copies of upstream libraries that we already distribute. Therefore -# we use this script to remove the code before shipping it. -# Invoke this script while in the directory where the tarball is located: -# ./kodi-generate-tarball-xz.sh -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-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-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-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 -Patch1: kodi-18.0-versioning.patch - -# fix assert at startup -Patch2: kodi-18a1-assert.patch - -%ifarch x86_64 i686 -%global _with_crystalhd 1 -%endif - -# Upstream does not support ppc64 -ExcludeArch: %{power64} ppc64le - -BuildRequires: SDL2-devel -BuildRequires: SDL_image-devel -BuildRequires: a52dec-devel -BuildRequires: afpfs-ng-devel -BuildRequires: avahi-devel -BuildRequires: bluez-libs-devel -BuildRequires: boost-devel -BuildRequires: bzip2-devel -BuildRequires: cmake -BuildRequires: crossguid-devel -%if 0%{?_with_cwiid} -BuildRequires: cwiid-devel -%endif -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: e2fsprogs-devel -BuildRequires: enca-devel -BuildRequires: expat-devel -BuildRequires: faad2-devel -BuildRequires: firewalld-filesystem -%if 0%{?_with_external_ffmpeg} -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 -BuildRequires: gettext-autopoint -%endif -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: giflib-devel -BuildRequires: glew-devel -BuildRequires: glib2-devel -BuildRequires: gperf -BuildRequires: jasper-devel -BuildRequires: java-devel -BuildRequires: lame-devel -BuildRequires: lcms2-devel -BuildRequires: libXinerama-devel -BuildRequires: libXmu-devel -BuildRequires: libXtst-devel -BuildRequires: libass-devel >= 0.9.7 -%if 0%{?_with_libbluray} -BuildRequires: libbluray-devel -%endif -BuildRequires: libcap-devel -BuildRequires: libcdio-devel -%if 0%{?_with_libcec} -%if 0%{?fedora} > 24 -BuildRequires: libcec-devel >= 4.0.0 -%else -BuildRequires: libcec-devel < 4.0.0 -%endif -%endif -%if 0%{?_with_crystalhd} -BuildRequires: libcrystalhd-devel -%endif -BuildRequires: libcurl-devel -BuildRequires: libdca-devel -BuildRequires: libidn2-devel -BuildRequires: libinput-devel -%if 0%{?el6} -BuildRequires: libjpeg-devel -%else -BuildRequires: libjpeg-turbo-devel -%endif -BuildRequires: libmad-devel -BuildRequires: libmicrohttpd-devel -BuildRequires: libmms-devel -BuildRequires: libmodplug-devel -BuildRequires: libmpcdec-devel -BuildRequires: libmpeg2-devel -BuildRequires: libnfs-devel -BuildRequires: libogg-devel -# for AirPlay support -BuildRequires: shairplay-devel -BuildRequires: libplist-devel -BuildRequires: libpng-devel -BuildRequires: librtmp-devel -BuildRequires: libsamplerate-devel -BuildRequires: libsmbclient-devel -%if 0%{?_with_libssh} -BuildRequires: libssh-devel -%endif -BuildRequires: libtiff-devel -BuildRequires: libtool -BuildRequires: libuuid-devel -BuildRequires: libva-devel -BuildRequires: libvdpau-devel -BuildRequires: libvorbis-devel -%if 0%{?_with_wayland} -BuildRequires: libxkbcommon-devel -%endif -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: lzo-devel -BuildRequires: mariadb-devel -BuildRequires: mesa-libEGL-devel -BuildRequires: mesa-libGLES-devel -BuildRequires: mesa-libgbm-devel -BuildRequires: nasm -BuildRequires: pcre-devel -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 -BuildRequires: systemd-devel -BuildRequires: taglib-devel >= 1.10 -BuildRequires: tinyxml-devel -BuildRequires: tre-devel -BuildRequires: trousers-devel -BuildRequires: wavpack-devel -%if 0%{?_with_wayland} -BuildRequires: wayland-protocols-devel -BuildRequires: waylandpp-devel -%endif -BuildRequires: yajl-devel -BuildRequires: zlib-devel - -# Install major backends, users can remove them individually -Requires: %{name}-common = %{version}-%{release} -Requires: (%{name}-wayland = %{version}-%{release} if libwayland-server) -Requires: (%{name}-x11 = %{version}-%{release} if xorg-x11-server-Xorg) -Requires: (%{name}-firewalld = %{version}-%{release} if firewalld) - - -%description -Kodi is a free cross-platform media-player jukebox and entertainment hub. -Kodi can play a spectrum of of multimedia formats, and featuring playlist, -audio visualizations, slideshow, and weather forecast functions, together -third-party plugins. - -This is a meta package. - - -%package common -Summary: Common Kodi files and binaries -Requires: dejavu-sans-fonts -# need explicit requires for these packages -# as they are dynamically loaded via XBMC's arcane -# pseudo-DLL loading scheme (sigh) -%if 0%{?_with_libbluray} -Requires: libbluray%{?_isa} -%endif -%if 0%{?_with_libcec} -%if 0%{?fedora} > 24 -Requires: libcec%{?_isa} >= 4.0.0 -%else -Requires: libcec%{?_isa} < 4.0.0 -%endif -%endif -%if 0%{?_with_crystalhd} -Requires: libcrystalhd%{?_isa} -%endif -Requires: libmad%{?_isa} -Requires: librtmp%{?_isa} -Requires: shairplay-libs%{?_isa} - -# needed when doing a minimal install, see -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1844 -Requires: glx-utils -Requires: xorg-x11-utils - -# This is just symlinked to, but needed both at build-time -# and for installation -Requires: python2-pillow%{?_isa} - -%description common -Common Kodi files and binaries - - -%package devel -Summary: Development files needed to compile C programs against kodi -Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: xbmc-devel < 14.0 -Provides: xbmc-devel = %{version} - -%description devel -Kodi is a free cross-platform media-player jukebox and entertainment hub. -If you want to develop programs which use Kodi's libraries, you need to -install this package. - - -%package eventclients -Summary: Media center event client remotes -Obsoletes: xbmc-eventclients < 14.0 -Provides: xbmc-eventclients = %{version} - -%description eventclients -This package contains support for using Kodi with the PS3 Remote, the Wii -Remote, a J2ME based remote and the command line xbmc-send utility. - -%package eventclients-devel -Summary: Media center event client remotes development files -Requires: %{name}-eventclients%{?_isa} = %{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Obsoletes: xbmc-eventclients-devel < 14.0 -Provides: xbmc-eventclients-devel = %{version} - -%description eventclients-devel -This package contains the development header files for the eventclients -library. - - -%package firewalld -Summary: FirewallD metadata files for Kodi -Requires: firewalld-filesystem -Requires(post): firewalld-filesystem - -%description firewalld -This package contains FirewallD files for Kodi. - - -%package gbm -Summary: Kodi binary for Generic Buffer Management -Requires: %{name}-common = %{version}-%{release} - - -%description gbm -This package contains the Kodi binary for Generic Buffer Management. - - -%package wayland -Summary: Kodi binary for Wayland compositors -Requires: %{name}-common = %{version}-%{release} - - -%description wayland -This package contains the Kodi binary for Wayland compositors. - - -%package x11 -Summary: Kodi binary for X11 servers -Requires: %{name}-common = %{version}-%{release} - - -%description x11 -This package contains the Kodi binary for X11 servers. - - -%prep -%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 -mkdir {fedora-gbm,fedora-wayland,fedora-x11} - -for BACKEND in %{kodi_backends} -do - pushd fedora-$BACKEND -%cmake \ -%if %{with dvdcss} - -DLIBDVDCSS_URL=%{SOURCE4} \ -%else - -DENABLE_DVDCSS=OFF \ -%endif -%if ! 0%{?_with_external_ffmpeg} - -DFFMPEG_URL=%{SOURCE5} \ -%endif - -DENABLE_EVENTCLIENTS=ON \ - -DENABLE_INTERNAL_CROSSGUID=OFF \ - -DLIRC_DEVICE=/var/run/lirc/lircd \ - -DLIBDVDNAV_URL=%{SOURCE2} \ - -DLIBDVDREAD_URL=%{SOURCE3} \ - -DPYTHON_EXECUTABLE=%{__python2} \ - -DCORE_PLATFORM_NAME=$BACKEND \ -%ifarch x86_64 i686 - -DWAYLAND_RENDER_SYSTEM=gl \ - -DGBM_RENDER_SYSTEM=gl \ -%else - -DWAYLAND_RENDER_SYSTEM=gles \ - -DGBM_RENDER_SYSTEM=gles \ -%endif - ../ - cmake --build . -- VERBOSE=1 %{?_smp_mflags} - popd -done - - -%install -for BACKEND in %{kodi_backends} -do - pushd fedora-$BACKEND - make DESTDIR=$RPM_BUILD_ROOT %{?_smp_mflags} install - popd -done - -# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir -rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ - -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 -ln -s %{python2_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/kodi/addons/script.module.pil/lib/PIL -#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib -#ln -s %{python2_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 - -# Use external font files instead of bundled ones -ln -sf %{_fontbasedir}/dejavu/DejaVuSans-Bold.ttf ${RPM_BUILD_ROOT}%{_datadir}/kodi/addons/skin.estouchy/fonts/ - -# Move man-pages into system dir -mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ -mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ - - -%post firewalld -%firewalld_reload - - -%files - - -%files common -%license LICENSE.md LICENSES/ -%doc README.md docs -%{_bindir}/kodi -%{_bindir}/kodi-standalone -%{_bindir}/TexturePacker -%dir %{_libdir}/kodi/ -%{_libdir}/kodi/addons/ -%{_libdir}/kodi/system/ -%{_datadir}/kodi/ -%{_datadir}/xsessions/kodi.desktop -%{_datadir}/applications/kodi.desktop -%{_datadir}/icons/hicolor/*/*/*.png -%{_mandir}/man1/kodi.1.gz -%{_mandir}/man1/kodi.bin.1.gz -%{_mandir}/man1/kodi-standalone.1.gz - - -%files devel -%{_includedir}/kodi - - -%files eventclients -%license LICENSE.md LICENSES/ -%{python2_sitelib}/kodi -%dir %{_datadir}/pixmaps/kodi -%{_datadir}/pixmaps/kodi/*.png -%{_bindir}/kodi-ps3remote -%{_bindir}/kodi-send -%{_bindir}/kodi-wiiremote -%{_mandir}/man1/kodi-ps3remote.1.gz -%{_mandir}/man1/kodi-send.1.gz -%{_mandir}/man1/kodi-wiiremote.1.gz - - -%files eventclients-devel -%{_includedir}/kodi/xbmcclient.h - - -%files firewalld -%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 - - -%files gbm -%{_libdir}/kodi/kodi-gbm - - -%files wayland -%{_libdir}/kodi/kodi-wayland - - -%files x11 -%{_libdir}/kodi/kodi-x11 -%{_libdir}/kodi/kodi-xrandr - - -%changelog -<<<<<<< HEAD -* Sat Nov 10 2018 Daniel Steiner - 18.0-0.10.rc0 -- Update to RC0 - -======= ->>>>>>> Update to Kodi Leia Beta 5 -* Sun Nov 4 2018 Daniel Steiner - 18.0-0.10.b5 -- Update to beta5