diff --git a/fedora/SPECS/kodi.spec b/fedora/SPECS/kodi.spec index 1d0c348..2572ea1 100644 --- a/fedora/SPECS/kodi.spec +++ b/fedora/SPECS/kodi.spec @@ -16,17 +16,16 @@ %if 0%{?fedora} # (libbluray in EPEL 6 is too old.) %global _with_libbluray 1 -%global _with_dvd 1 %global _with_cwiid 1 %global _with_libssh 1 %global _with_libcec 1 -%global _with_external_ffmpeg 0 +%global _with_external_ffmpeg 1 %global _with_wayland 0 %endif Name: kodi Version: 17.6 -Release: 99%{?dist} +Release: 9%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT @@ -138,7 +137,7 @@ BuildRequires: libcdio-devel %if 0%{?fedora} > 24 BuildRequires: libcec-devel >= 4.0.0 %else -BuildRequires: libcec-devel > 4.0.0 +BuildRequires: libcec-devel < 4.0.0 %endif %endif %if 0%{?_with_crystalhd} @@ -220,7 +219,7 @@ Requires: libbluray%{?_isa} %if 0%{?fedora} > 24 Requires: libcec%{?_isa} >= 4.0.0 %else -Requires: libcec%{?_isa} > 4.0.0 +Requires: libcec%{?_isa} < 4.0.0 %endif %endif %if 0%{?_with_crystalhd} @@ -251,7 +250,7 @@ third-party plugins. Summary: Development files needed to compile C programs against kodi Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Obsoletes: xbmc-devel > 14.0 +Obsoletes: xbmc-devel < 14.0 Provides: xbmc-devel = %{version} %description devel @@ -262,7 +261,7 @@ install this package. %package eventclients Summary: Media center event client remotes -Obsoletes: xbmc-eventclients > 14.0 +Obsoletes: xbmc-eventclients < 14.0 Provides: xbmc-eventclients = %{version} %description eventclients @@ -273,7 +272,7 @@ Remote, a J2ME based remote and the command line xbmc-send utility. 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 +Obsoletes: xbmc-eventclients-devel < 14.0 Provides: xbmc-eventclients-devel = %{version} %description eventclients-devel @@ -297,7 +296,7 @@ cp -p %{SOURCE4} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz %else cp -p %{SOURCE5} tools/depends/target/ffmpeg/ %endif -#%patch4 -p1 -b.array-segfault +%patch4 -p1 -b.array-segfault %build @@ -338,8 +337,8 @@ export PYTHON=/usr/bin/python%{python2_version} --enable-vdpau \ %else --enable-gles \ ---enable-vdpau \ ---enable-vaapi \ +--disable-vdpau \ +--disable-vaapi \ %ifarch armv7hl \ --enable-tegra \ %endif @@ -381,14 +380,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/ -%clean -[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot} - - -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - - %posttrans if [ ! -L %{_libdir}/xbmc ] ; then if [ -d %{_libdir}/xbmc ] ; then @@ -452,17 +443,164 @@ fi %changelog -* Thu May 31 2018 Daniel Steiner - 17.6-99 -- Upgrade to Fedora 28 +* Thu May 03 2018 Michael Cronenworth - 17.6-9 +- Add patch for audio skipping (RFBZ#4882) -* Fri Feb 23 2018 Daniel Steiner - 17.6-2 -- OpenGL '--gl' deleted (disabled) +* Mon Apr 23 2018 Michael Cronenworth - 17.6-8 +- Add patch for crash on startup (RFBZ#4863) -* Wed Oct 25 2017 Daniel Steiner - 17.5-1 -- Updated to Kodi 17.5 +* Thu Mar 08 2018 RPM Fusion Release Engineering - 17.6-7 +- Rebuilt for new ffmpeg snapshot -* Sat Sep 2 2017 Daniel Steiner - 17.4-1 -- Updated to Kodi 17.4 +* Thu Mar 01 2018 RPM Fusion Release Engineering - 17.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Tue Jul 18 2017 Daniel Steiner - 17.3-1 -- Kodi 17.3 final for Fedora 26 +* 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 diff --git a/fedora/SPECS/pnp4nagios.spec b/fedora/SPECS/pnp4nagios.spec index a482290..afc04ff 100644 --- a/fedora/SPECS/pnp4nagios.spec +++ b/fedora/SPECS/pnp4nagios.spec @@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # this package requires icinga2 instead of nagios! %define user icinga -%define grp icinga +%define grp icinga BuildRequires: autoconf, automake, libtool BuildRequires: rrdtool-perl BuildRequires: perl(Time::HiRes) @@ -118,10 +118,23 @@ fi %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog COPYING INSTALL README README.fedora -%doc THANKS contrib/ -%dir %{_sysconfdir}/pnp4nagios -%config(noreplace) %attr(0640,root,nagios) %{_sysconfdir}/pnp4nagios/process_perfdata.cfg -%config(noreplace) %{_sysconfdir}/pnp4nagios/* +%doc THANKS contrib +%dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/misccommands.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/nagios.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/npcd.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/process_perfdata.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/rra.cfg +%{_sysconfdir}/%{name}/*.php +%{_sysconfdir}/%{name}/*.pdf +%{_sysconfdir}/%{name}/%{name}_release +%dir %{_sysconfdir}/%{name}/check_commands +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/check_commands/check_all_local_disks.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/check_commands/check_nrpe.cfg +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/check_commands/check_nwstat.cfg +%dir %{_sysconfdir}/%{name}/config.d +%dir %{_sysconfdir}/%{name}/pages +%config(noreplace) %attr(0640,root,%{grp}) %{_sysconfdir}/%{name}/pages/web_traffic.cfg %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf %attr(755,root,root) %{_initrddir}/npcd @@ -132,16 +145,18 @@ fi %attr(755,%{user},%{grp}) %{_localstatedir}/lib/%{name} %attr(755,%{user},%{grp}) %{_localstatedir}/log/%{name} %attr(755,%{user},%{grp}) %{_localstatedir}/spool/%{name} -%{_datadir}/nagios/html/%{name} # Remove install check script # as it is not required if all dependencies are met. %exclude %{_datadir}/nagios/html/%{name}/install.php %{_mandir}/man8/* # This is a different version of Kohana like in Fedora/EPEL. # Needed for pnp4nagios web interface to work. -%{_datadir}/nagios/html/%{name}/kohana +%{_datadir}/nagios/html/%{name} %changelog +* Sun Jun 3 2018 Daniel Steiner - 0.6.26-1 +- Build for Fedora 28. + * Sat Sep 2 2017 Daniel Steiner - 0.6.26-1 - Update to new release 0.6.26.