Author: alexlan Update of /cvs/free/rpms/xbmc/F-17 In directory se02.es.rpmfusion.net:/tmp/cvs-serv29743 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Log Message: Update to Eden RC2 (sync with devel branch) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/F-17/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 29 Jan 2012 18:00:10 -0000 1.12 +++ .cvsignore 9 Mar 2012 21:09:18 -0000 1.13 @@ -1 +1 @@ -xbmc-11.0-Eden_beta2-patched.tar.xz +xbmc-11.0-Eden_rc2-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/F-17/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 29 Jan 2012 18:00:10 -0000 1.14 +++ sources 9 Mar 2012 21:09:18 -0000 1.15 @@ -1 +1 @@ -1a545ba86f502407d2057773183a5998 xbmc-11.0-Eden_beta2-patched.tar.xz +ae6eb53e53943ef9257c2b116ffc6fba xbmc-11.0-Eden_rc2-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/F-17/xbmc-generate-tarball-xz.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xbmc-generate-tarball-xz.sh 29 Jan 2012 18:00:10 -0000 1.12 +++ xbmc-generate-tarball-xz.sh 9 Mar 2012 21:09:18 -0000 1.13 @@ -2,7 +2,7 @@ MAJORVERSION=11 MINORVERSION=0 -PRERELEASE=Eden_beta2 +PRERELEASE=Eden_rc2 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}} @@ -25,7 +25,7 @@ # grrr, *still* have to keep in ffmpeg for now (2011-12-28) since upstream # seems to require files within that subdirectory <sigh>, filed # http://trac.xbmc.org/ticket/12370 -for i in cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 +for i in cximage-6.0/zlib libid3tag/zlib libhdhomerun libmpeg2 ffmpeg do rm -r lib/$i done Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-17/xbmc.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- xbmc.spec 9 Mar 2012 12:39:45 -0000 1.40 +++ xbmc.spec 9 Mar 2012 21:09:18 -0000 1.41 @@ -1,11 +1,11 @@ -%global PRERELEASE Eden_beta2 +%global PRERELEASE Eden_rc2 #global DIRVERSION %{version} # use below for pre-release %global DIRVERSION %{version}-%{PRERELEASE} Name: xbmc Version: 11.0 -Release: 0.7.%{PRERELEASE}%{?dist} +Release: 0.10.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -150,8 +150,6 @@ # and for installation BuildRequires: python-imaging Requires: python-imaging -BuildRequires: python-sqlite2 -Requires: python-sqlite2 %post /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -171,20 +169,20 @@ and featuring playlist, audio visualizations, slideshow, and weather forecast functions, together third-party plugins. -%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} + +#%%description eventclients-devel +#%This package contains the development header files for the eventclients +#%library. %prep @@ -224,7 +222,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/ @@ -236,8 +234,8 @@ # the system Python interpreter, we also want to use the system libraries install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib ln -s %{python_sitearch}/PIL $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pil/lib/PIL -install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib -ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 +#install -d $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib +#ln -s %{python_sitearch}/pysqlite2 $RPM_BUILD_ROOT%{_libdir}/xbmc/addons/script.module.pysqlite/lib/pysqlite2 %clean @@ -254,23 +252,33 @@ %{_datadir}/applications/xbmc.desktop %{_datadir}/icons/hicolor/*/*/*.png -%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 +#%%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 %changelog +* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.10.Eden_rc2 +- Update to Eden release candidate 2 (rc2) + +* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.9.Eden_beta2 +- Temporarily drop clientevents package (currently fails to build) to + fix overall FTBFS. + +* Fri Mar 9 2012 Alex Lancaster <alexlan[AT]fedoraproject org> - 11.0-0.8.Eden_beta2 +- Drop python-sqlite2 BR (obsoleted package), should use internal sqlite3 (#2217) + * Fri Mar 09 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 11.0-0.7.Eden_beta2 - Rebuilt for FFmpeg/x264