3:29 a.m.
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29589
Modified Files:
mythtv.spec sources
Removed Files:
mythplugins-0.21-svnfixes.patch mythtv-0.21-svnfixes.patch
Log Message:
* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
- Update to pre-0.22 svn trunk revision 20701
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.37 -r 1.38 mythtv.spec
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mythtv.spec 4 Jun 2009 15:00:46 -0000 1.37
+++ mythtv.spec 15 Jun 2009 03:29:44 -0000 1.38
@@ -1,37 +1,128 @@
-# svn revision number
-%define _svnver r20671
-%define branch release-0-21-fixes
-# Nb: base 0.21 svn rev is r16468
-#define branch trunk
-
-# disabled options
-%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
-%define with_directfb %{?_with_directfb: 1} %{?!_with_directfb: 0}
-%define with_festival %{?_with_festival: 1} %{?!_with_festival: 0}
-%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
+#
+# Specfile for building MythTV and MythPlugins RPMs from a subversion checkout.
+#
+# by: Chris Petersen <rpm(a)forevermore.net>
+# Jarod Wilson <jarod(a)wilsonet.com>
+#
+# Modified/Extended from the great (non-svn based) work of:
+# Axel Thimm <Axel.Thimm(a)ATrpms.net>
+# David Bussenschutt <buzz(a)oska.com>
+# and others; see changelog at bottom for details.
+#
+# The latest version of this file can be found at:
+#
+# http://www.mythtv.org/wiki/index.php/Mythtv-svn-rpmbuild.spec
+#
+# Note:
+#
+# This spec relies upon several files included in the RPMFusion mythtv
+# src.rpm file. Please install it into your build tree before trying to
+# build anything with this spec.
+#
+# Explanation of options:
+#
+# --with proc_opt Enable MythTV's optimized processor detection code
+# and override RPM's defaults.
+# --with debug Enable debug mode
+#
+# The following options are disabled by default. Use these options to enable:
+#
+# --with directfb Enable directfb support
+#
+# The following options are enabled by default. Use these options to disable:
+#
+# --without xvmcnvidia Disable NVidia XvMC support
+# --without perl Disable building of the perl bindings
+# --without python Disable building of the python bindings
+#
+# # All plugins get built by default, but you can disable them as you wish:
+#
+# --without mytharchive
+# --without mythbrowser
+# --without mythflix
+# --without mythgallery
+# --without mythgame
+# --without mythmovies
+# --without mythmusic
+# --without mythnews
+# --without mythvideo
+# --without mythweather
+# --without mythzoneminder
+# --without mythweb
+#
+################################################################################
+
+# A list of which applications we want to put into the desktop menu system
%define desktop_applications mythfrontend mythtv-setup
-%define desktop_vendor RPMFusion
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_version: %define python_version %(%{__python} -c 'import sys; print
sys.version.split(" ")[0]')}
+# The vendor name we should attribute the aforementioned entries to
+%define desktop_vendor RPMFusion
+
+# SVN Revision number and branch ID
+%define _svnrev r20701
+%define branch trunk
+
+#
+# Basic descriptive tags for this package:
+#
+Name: mythtv
+Summary: A digital video recorder (DVR) application.
+URL: http://www.mythtv.org/
+Group: Applications/Multimedia
-Summary: A digital video recorder (DVR) application
-Name: mythtv
-Version: 0.21
+# Version/Release info
+Version: 0.22
%if "%{branch}" == "trunk"
-Release: 0.2.%{_svnver}%{?dist}
+Release: 0.2.svn.%{_svnrev}%{?dist}
%else
-Release: 19%{?dist}
+Release: 1%{?dist}
%endif
-URL: http://www.mythtv.org/
+
# The primary license is GPLv2+, but bits are borrowed from a number of
# projects... For a breakdown of the licensing, see PACKAGE-LICENSING.
License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or LGPLv2+)
-Group: Applications/Multimedia
-Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
-Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
-Source10: PACKAGE-LICENSING
+
+################################################################################
+
+# Set "--with proc_opt" to let mythtv autodetect your CPU and run its
+# processor-specific optimizations. It seems to cause compile problems on many
+# systems (particularly x86_64), so it is classified by the MythTV developers
+# as "use at your own risk."
+%define with_proc_opt %{?_with_proc_opt: 1} %{!?_with_proc_opt: 0}
+
+# Set "--with debug" to enable MythTV debug compile mode
+%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0}
+
+# The following options are enabled by default. Use --without to disable them
+%define with_perl %{?_without_perl: 0} %{!?_without_perl: 1}
+%define with_python %{?_without_python: 0} %{!?_without_python: 1}
+%define with_pulseaudio %{?_without_pulseaudio: 0} %{!?_without_pulseaudio: 1}
+
+# The following options are disabled by default. Use --with to enable them
+%define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0}
+%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0}
+
+# All plugins get built by default, but you can disable them as you wish
+%define with_plugins %{?_without_plugins: 0} %{!?_without_plugins:
1}
+%define with_mytharchive %{?_without_mytharchive: 0} %{!?_without_mytharchive:
1}
+%define with_mythbrowser %{?_without_mythbrowser: 0} %{!?_without_mythbrowser:
1}
+%define with_mythflix %{?_without_mythflix: 0} %{!?_without_mythflix:
1}
+%define with_mythgallery %{?_without_mythgallery: 0} %{!?_without_mythgallery:
1}
+%define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame:
1}
+%define with_mythmovies %{?_without_mythmovies: 0} %{!?_without_mythmovies:
1}
+%define with_mythmusic %{?_without_mythmusic: 0} %{!?_without_mythmusic:
1}
+%define with_mythnews %{?_without_mythnews: 0} %{!?_without_mythnews:
1}
+%define with_mythvideo %{?_without_mythvideo: 0} %{!?_without_mythvideo:
1}
+%define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather:
1}
+%define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb:
1}
+%define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder:
1}
+
+################################################################################
+
+Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2
+Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2
+Source10: PACKAGE-LICENSING
Source101: mythbackend.sysconfig.in
Source102: mythbackend.init.in
Source103: mythbackend.logrotate.in
@@ -41,127 +132,194 @@
Source109: mythtv-setup.desktop
Source110: mysql.txt
Source401: mythweb.conf
-# Patches
-Patch100: mythtv-0.21-svnfixes.patch
-Patch101: mythtv-0.20-mythstreammenu.diff
-#Patch102: mythtv-0.21-fedora-settings.patch
-Patch200: mythplugins-0.21-svnfixes.patch
-#Patch201: mythplugins-0.21-fedora-settings.patch
-#
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: freetype-devel >= 2
-%if 0%{?fedora} >= 9
-BuildRequires: qt3-devel
-%else
-BuildRequires: qt-devel >= 3
+Patch0: mythtv-0.22-enable-x86_64-fast_cmov-by-default.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+################################################################################
+# Python setup
+
+%if %{with_python}
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_version: %define python_version %(%{__python} -c 'import sys; print
sys.version.split(" ")[0]')}
%endif
-BuildRequires: mysql-devel >= 5
+
+################################################################################
+
+# Global MythTV and Shared Build Requirements
+
+BuildRequires: desktop-file-utils
+BuildRequires: freetype-devel >= 2
+BuildRequires: gcc-c++
+BuildRequires: mysql-devel >= 5
+BuildRequires: qt4-devel
[...1765 lines suppressed...]
-%{_datadir}/mythtv/mythflix
-%{_datadir}/mythtv/i18n/mythflix_*.qm
-%{_datadir}/mythtv/i18n/mythflix_*.ts
-%{_datadir}/mythtv/netflix_menu.xml
-
-%files -n mytharchive
+%if %{with_mythvideo}
+%files -n mythvideo
%defattr(-,root,root,-)
-%doc mythplugins-%{version}/mytharchive/AUTHORS
-%doc mythplugins-%{version}/mytharchive/COPYING
-%doc mythplugins-%{version}/mytharchive/README
-%doc mythplugins-%{version}/mytharchive/TODO
-%{_bindir}/mytharchivehelper
-%{_libdir}/mythtv/plugins/libmytharchive.so
-%{_datadir}/mythtv/archiveformat.xml
-%{_datadir}/mythtv/archivemenu.xml
-%{_datadir}/mythtv/archiveutils.xml
-%{_datadir}/mythtv/mytharchive
-%{_datadir}/mythtv/i18n/mytharchive_*.qm
+%doc mythplugins-%{version}/mythvideo/COPYING
+%doc mythplugins-%{version}/mythvideo/README*
+%{_libdir}/mythtv/plugins/libmythvideo.so
+%{_datadir}/mythtv/mythvideo
+%{_datadir}/mythtv/i18n/mythvideo_*.qm
+%{_datadir}/mythtv/video_settings.xml
+%{_datadir}/mythtv/videomenu.xml
+%{_localstatedir}/lib/mythvideo
+%{_bindir}/mtd
+%endif
-%files -n mythzoneminder
+%if %{with_mythweather}
+%files -n mythweather
%defattr(-,root,root,-)
-%{_libdir}/mythtv/plugins/libmythzoneminder.so
-%{_datadir}/mythtv/zonemindermenu.xml
-%{_bindir}/mythzmserver
+%doc mythplugins-%{version}/mythweather/AUTHORS
+%doc mythplugins-%{version}/mythweather/COPYING
+%doc mythplugins-%{version}/mythweather/README
+%{_libdir}/mythtv/plugins/libmythweather.so
+%{_datadir}/mythtv/i18n/mythweather_*.qm
+%{_datadir}/mythtv/weather_settings.xml
+%{_datadir}/mythtv/mythweather
+%endif
+%if %{with_mythweb}
%files -n mythweb
%defattr(-,root,root,-)
%doc mythplugins-%{version}/mythweb/README
@@ -1006,40 +1451,121 @@
%defattr(-,apache,apache,0775)
%dir %{_datadir}/mythweb
%{_datadir}/mythweb/*
+%endif
-%files -n perl-MythTV
+%if %{with_mythzoneminder}
+%files -n mythzoneminder
%defattr(-,root,root,-)
-%{perl_vendorlib}/MythTV.pm
-%dir %{perl_vendorlib}/MythTV
-%{perl_vendorlib}/MythTV/*.pm
-%dir %{perl_vendorlib}/IO/Socket
-%dir %{perl_vendorlib}/IO/Socket/INET
-%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
-%exclude %{perl_vendorarch}/auto/MythTV/.packlist
+%{_libdir}/mythtv/plugins/libmythzoneminder.so
+%{_datadir}/mythtv/zonemindermenu.xml
+%{_bindir}/mythzmserver
+%endif
-%files -n python-MythTV
-%defattr(-,root,root,-)
-%dir %{python_sitelib}/MythTV/
-%{python_sitelib}/MythTV/*
-%if 0%{?fedora} >= 9
-%{python_sitelib}/MythTV-*.egg-info
%endif
+################################################################################
+
%changelog
-* Wed Jun 03 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-19
-- Update to release-0-21-fixes patches (r20671)
+* Sun Jun 14 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20701
+- Update to pre-0.22 svn trunk revision 20701
+
+* Thu Jun 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20668
+- Update to pre-0.22 svn trunk revision 20668
+
+* Sun May 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20586
+- Update to pre-0.22 svn trunk revision 20586
+- Fix upgrade path for people that have mythphone installed (rfbz#596)
+- Remove ExcludeArch: ppc64, build deps now present
+
+* Mon May 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20488
+- Update to pre-0.22 svn trunk, revision 20488
+
+* Tue Apr 28 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20462
+- Update to pre-0.22 svn trunk, revision 20462
+
+* Fri Apr 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20448
+- Update to pre-0.22 svn trunk, revision 20448
+- Add BR: pulseaudio-libs-devel to enable proper pulseaudio support (rfbz#567)
+
+* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20371
+- Update to pre-0.22 svn trunk, revision 20371
+- Relocate Requires: wget to the sub-packages where necessary (rfbz#384)
+- Don't use a52dec, mythtv has its own internal support these days
+
+* Tue Apr 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20317
+- Update to pre-0.22 svn trunk, revision 20317
+
+* Tue Mar 31 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r20293
+- Update to pre-0.22 svn trunk, revision 20293
+- Add BuildRequires: phonon-devel
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
0.22-0.2.svn.r20273
+- rebuild for new F11 features
+
+* Fri Mar 27 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20273
+- Update to pre-0.22 svn trunk, revision 20273
+
+* Fri Mar 20 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20232
+- Update to pre-0.22 svn trunk, revision 20232
+
+* Thu Mar 12 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20196
+- Update to pre-0.22 svn trunk, revision r20196
+- Carries work-around for qt 4.5 "everthing is a prepared statement now"
+ bug/quirk (rpmfusion bz#421)
+
+* Wed Mar 04 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20107
+- Update to pre-0.22 svn trunk, revision 20107
+- Features misc gcc 4.4 and qt 4.5 build fixage
+
+* Mon Mar 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20089
+- Update to pre-0.22 svn trunk, revision 20089
+
+* Wed Feb 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r20019
+- Update to pre-0.22 svn trunk, revision 20019
+
+* Wed Feb 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19980
+- Update to pre-0.22 svn trunk, revision 19980
+
+* Thu Jan 29 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19874
+- Update to pre-0.22 svn trunk, revision 19874
+
+* Sat Jan 24 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19811
+- Update to pre-0.22 svn trunk, revision 19811
+- Drop mythcontrols plugin (functionality merged into mythfrontend)
+- Re-enable building iptv support
+
+* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19722
+- Update to pre-0.22 svn trunk, revision 19722
+- MythPhone plugin is dead as a doornail (MythTV changeset 19702)
+
+* Sat Jan 17 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19721
+- Update to pre-0.22 svn trunk, revision 19721
+
+* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19630
+- Update to pre-0.22 svn trunk, revision 19630
+- Fix a %%files list screw-up w/mythgame-emulators nukage
+
+* Fri Jan 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19622
+- Update to pre-0.22 svn trunk, revision 19622
+
+* Fri Jan 02 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19534
+- Update to pre-0.22 svn trunk, revision 19534
+- Re-disable mythgame-emulators sub-pgk, was accidentally re-enabled
+
+* Sun Dec 28 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19467
+- Update to pre-0.22 svn trunk, revision 19467
+
+* Mon Dec 15 2008 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.1.svn.r19390
+- MythTV svn trunk (pre-0.22), revision 19390
+- Re-enable fast cmov on x86_64 by default
+- Add BR: yasm-devel to enable yasm-specific improvements
-* Mon Apr 13 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-18
-- Update release-0-21-fixes patches (r20373)
-- Slide Requires: wget into more appropriate places (rfbz#384)
-
-* Thu Jan 22 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-17
-- Update release-0-21-fixes patches (r19788)
-- Add Require: perl-XML-SAX to mythweather (rpmfusion bz#337)
-
-* Tue Dec 30 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-16
-- Update release-0-21-fixes patches (r19505)
-- Fixes infinite loop introduced by firewire fix in -15 (rpmfusion bz#286)
+* Sat Dec 13 2008 Chris Petersen <rpm(a)forevermore.net> 0.22-0.1.svn
+- Update to compile for pre-0.22 svn trunk, including new files and qt4 deps
+- Major cleanup and porting from my personal spec (which was a combination
+ of works from atrpms and some of Jarod's earlier works).
+- Add a few more --with and --without options, including the ability to
+ disable specific mythplugins and/or all plugins.
* Thu Dec 11 2008 Jarod Wilson <jarod(a)wilsonet.com> - 0.21-15
- Update to release-0-21-fixes patches (r19344)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 4 Jun 2009 04:09:35 -0000 1.18
+++ sources 15 Jun 2009 03:29:44 -0000 1.19
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-6c08043227bef1384858deee12b5cdc3 mythplugins-0.21.tar.bz2
-49fc135e1cde90cd935c1229467fa37e mythtv-0.21.tar.bz2
+80c40baef70936de0e7fed3213180023 mythtv-0.22.tar.bz2
+d5217919d5e849f29aa74b616676eef5 mythplugins-0.22.tar.bz2
--- mythplugins-0.21-svnfixes.patch DELETED ---
--- mythtv-0.21-svnfixes.patch DELETED ---