Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19232 Modified Files: mythtv.spec Log Message: * Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-9 - Conditionalize some qt/qt3 stuff so spec builds on all currently supported Fedora releases - Add work-around for lirc-lib mock quirk on f8 builds Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mythtv.spec 18 Aug 2008 01:26:30 -0000 1.2 +++ mythtv.spec 3 Sep 2008 16:38:50 -0000 1.3 @@ -22,7 +22,7 @@ %if "%{branch}" == "trunk" Release: 0.2.%{_svnver}%{?dist} %else -Release: 8%{?dist} +Release: 9%{?dist} %endif URL: http://www.mythtv.org/ # The primary license is GPLv2+, but bits are borrowed from a number of @@ -50,14 +50,19 @@ # BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: freetype-devel >= 2 -BuildRequires: qt3-devel, mysql-devel >= 5 +%if 0%{?fedora} >= 9 +BuildRequires: qt3-devel +%else +BuildRequires: qt-devel >= 3, qt-devel < 4 +%endif +BuildRequires: mysql-devel >= 5 # Audio framework support BuildRequires: alsa-lib-devel, arts-devel BuildRequires: jack-audio-connection-kit-devel # Need dvb headers to build in dvb support BuildRequires: kernel-headers -# Remote control support -BuildRequires: lirc-devel +# Remote control support (BR: on lirc-lib works around some mock funkiness on f8) +BuildRequires: lirc-devel, lirc-lib # X, Xv, and XvMC video support BuildRequires: libXxf86vm-devel, libXmu-devel BuildRequires: libXvMC-devel, libXv-devel @@ -176,8 +181,12 @@ %package -n libmyth Summary: Library providing mythtv support Group: System Environment/Libraries -Requires: lame, qt3 -Requires: qt3-MySQL +Requires: lame +%if 0%{?fedora} >= 9 +Requires: qt3, qt3-MySQL +%else +Requires: qt, qt-MySQL +%endif %description -n libmyth Common library code for MythTV and add-on modules (development) @@ -188,7 +197,12 @@ Summary: Development files for libmyth Group: Development/Libraries Requires: libmyth = %{version}-%{release} -Requires: freetype-devel >= 2, lame-devel, qt3-devel, +Requires: freetype-devel >= 2, lame-devel +%if 0%{?fedora} >= 9 +Requires: qt3-devel +%else +Requires: qt-devel +%endif Requires: mysql-devel Requires: alsa-lib-devel, arts-devel Requires: libGL-devel, libGLU-devel @@ -1003,6 +1017,11 @@ %endif %changelog +* Wed Sep 03 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-9 +- Conditionalize some qt/qt3 stuff so spec builds on + all currently supported Fedora releases +- Add work-around for lirc-lib mock quirk on f8 builds + * Fri Aug 15 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; - 0.21-8 - Don't BR: libdvdcss-devel - Update release-0-21-fixes patches (r18161)