Author: mooninite Update of /cvs/free/rpms/xbmc/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18018 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-13.0-versioning.patch Log Message: * Sun Apr 20 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.0-0.13.Gotham_beta4 - Update to Gotham beta 4 - Enable clientevents package xbmc-13.0-versioning.patch: Application.cpp | 2 +- GitRevision.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE xbmc-13.0-versioning.patch --- --- a/xbmc/GitRevision.h 2014-04-18 17:47:17.000000000 -0500 +++ b/xbmc/GitRevision.h 2014-04-20 18:26:11.509554641 -0500 @@ -1,5 +1,7 @@ #pragma once +#undef GIT_REV + /* * Copyright (C) 2011-2013 Team XBMC * http://xbmc.org --- a/xbmc/Application.cpp 2014-04-18 17:47:17.000000000 -0500 +++ b/xbmc/Application.cpp 2014-04-20 18:10:35.171011439 -0500 @@ -693,7 +693,7 @@ CProfilesManager::Get().Load(); CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------"); - CLog::Log(LOGNOTICE, "Starting XBMC (%s). Platform: %s %s %d-bit", g_infoManager.GetVersion().c_str(), g_sysinfo.GetBuildTargetCpuFamily().c_str(), + CLog::Log(LOGNOTICE, "Starting XBMC from RPM Fusion (%s). Platform: %s %s %d-bit", g_infoManager.GetVersion().c_str(), g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetBuildTargetPlatformName().c_str(), g_sysinfo.GetXbmcBitness()); /* Expand macro before stringify */ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-20/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 3 Apr 2014 01:32:57 -0000 1.24 +++ .cvsignore 21 Apr 2014 00:48:25 -0000 1.25 @@ -1 +1 @@ -xbmc-13.0-Gotham_beta3-patched.tar.xz +xbmc-13.0-Gotham_beta4-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-20/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 Apr 2014 01:32:57 -0000 1.26 +++ sources 21 Apr 2014 00:48:25 -0000 1.27 @@ -1 +1 @@ -0e395e029185741584a997e1299b634e xbmc-13.0-Gotham_beta3-patched.tar.xz +a5307e6224e8a96c16833f26c173a55e xbmc-13.0-Gotham_beta4-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-20/xbmc-generate-tarball-xz.sh,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- xbmc-generate-tarball-xz.sh 3 Apr 2014 01:32:57 -0000 1.24 +++ xbmc-generate-tarball-xz.sh 21 Apr 2014 00:48:25 -0000 1.25 @@ -2,7 +2,7 @@ MAJORVERSION=13 MINORVERSION=0 -PRERELEASE=Gotham_beta3 +PRERELEASE=Gotham_beta4 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-20/xbmc.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- xbmc.spec 16 Apr 2014 09:58:44 -0000 1.71 +++ xbmc.spec 21 Apr 2014 00:48:25 -0000 1.72 @@ -1,4 +1,4 @@ -%global PRERELEASE Gotham_beta3 +%global PRERELEASE Gotham_beta4 #%%global DIRVERSION %{version} # use the line below for pre-releases %global DIRVERSION %{version}-%{PRERELEASE} @@ -6,7 +6,7 @@ Name: xbmc Version: 13.0 -Release: 0.12.Gotham_beta3%{?dist} +Release: 0.13.Gotham_beta4%{?dist} Summary: Media center License: GPLv2+ and GPLv3+ @@ -32,6 +32,9 @@ # https://bugzilla.redhat.com/1069079 Patch3: xbmc-13.0-libmysqlclient.patch +# Set program version parameters +Patch4: xbmc-13.0-versioning.patch + # External ffmpeg patches Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch @@ -212,20 +215,21 @@ libraries, you need to install this package. -#%%package eventclients -#%Summary: Media center event client remotes +%package eventclients +Summary: Media center event client remotes -#%%description eventclients -#%This package contains support for using XBMC 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 = %{version}-%{release} - -#%%description eventclients-devel -#%This package contains the development header files for the eventclients -#%library. +%description eventclients +This package contains support for using XBMC 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 = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description eventclients-devel +This package contains the development header files for the eventclients +library. %prep @@ -234,6 +238,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %patch100 -p1 %patch101 -p1 @@ -314,7 +319,7 @@ %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -#make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install +make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ @@ -362,24 +367,26 @@ %{_includedir}/xbmc -#%%files eventclients -#%%defattr(-,root,root) -#%%python_sitelib/xbmc -#%%dir %{_datadir}/pixmaps/xbmc -#%%{_datadir}/pixmaps/xbmc/*.png -#%%{_bindir}/xbmc-j2meremote -#%%{_bindir}/xbmc-ps3d -#%%{_bindir}/xbmc-ps3remote -#%%{_bindir}/xbmc-send -#%%{_bindir}/xbmc-wiiremote - -#%%files eventclients-devel -#%%defattr(-,root,root) -#%%dir %{_includedir}/xbmc -#%%{_includedir}/xbmc/xbmcclient.h +%files eventclients +%python_sitelib/xbmc +%dir %{_datadir}/pixmaps/xbmc +%{_datadir}/pixmaps/xbmc/*.png +%{_bindir}/xbmc-j2meremote +%{_bindir}/xbmc-ps3d +%{_bindir}/xbmc-ps3remote +%{_bindir}/xbmc-send +%{_bindir}/xbmc-wiiremote + + +%files eventclients-devel +%{_includedir}/xbmc/xbmcclient.h %changelog +* Sun Apr 20 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.0-0.13.Gotham_beta4 +- Update to Gotham beta 4 +- Enable clientevents package + * Tue Apr 15 2014 Michael Cronenworth <mike(a)cchtml.com&gt; - 13.0-0.12.Gotham_beta3 - Update dvdread patch for new dvdread release