- up to svn 10931

[packages/mythtv.git] / mythtv.spec

diff --git a/mythtv.spec b/mythtv.spec
index deaec4f6ae944c49d716c9e7984e1075f849878f..6e2f2ba0c775ca2e7278edd9a001ac2b4be53b9f 100644 (file)
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -37,7 +37,7 @@ Summary:      A personal video recorder (PVR) application
 Summary(pl):   Osobista aplikacja do nagrywania obrazu (PVR)
 Name:          mythtv
 Version:       0.19
-Release:       0.20060213.0.1
+Release:       2.2
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -52,34 +52,35 @@ Patch2:             %{name}-mythstream.patch
 Patch3:                %{name}-ldconfig.patch
 Patch4:                %{name}-pl.patch
 Patch5:                %{name}-sbinpath.patch
+Patch6:                %{name}-ticket-1310.patch
+Patch7:                %{name}-optflags.patch
+Patch8:                %{name}-branch.diff
 URL:           http://www.mythtv.org/
 #BuildRequires:        DirectFB-devel
 BuildRequires: XFree86-devel
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    arts-devel >= 13:0.9.5}
+BuildRequires: freetype-devel >= 1:2.0.0
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
+BuildRequires: lame-libs-devel
+%{?with_xvmc:BuildRequires:    libXvMCW-devel}
+%{?with_firewire:BuildRequires:        libavc1394-devel}
 %{?with_dvb:BuildRequires:     libdvb-devel}
 BuildRequires: libdvdnav-devel
+%{?with_firewire:BuildRequires:        libiec61883-devel}
+%{?with_firewire:BuildRequires:        libraw1394-devel}
 %{?with_oggvorbis:BuildRequires:       libvorbis-devel}
-%if %{with firewire}
-BuildRequires: libavc1394-devel
-BuildRequires: libiec61883-devel # missing in PLD?
-BuildRequires: libraw1394-devel
-%endif
-BuildRequires: freetype-devel >= 1:2.0.0
-BuildRequires: gcc-c++
-BuildRequires: lame-libs-devel
-%{?with_xvmc:BuildRequires:    libXvMCW-devel}
 BuildRequires: linux-libc-headers >= 7:2.6.10
 %{?with_lirc:BuildRequires:    lirc-devel}
 BuildRequires: mysql-devel
+BuildRequires: patchutils
 BuildRequires: qmake >= 6:3.2.1-4
 BuildRequires: qt-devel >= 6:3.2.1-4
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: sed >= 4.0
 # for bundled libavcodec
 BuildRequires: libdts-devel
-BuildConflicts:        libmyth-devel
+#BuildConflicts:       libmyth-devel
 ExclusiveArch: %{ix86} %{x8664} ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -272,6 +273,9 @@ Statyczna biblioteka libmyth.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p0
+%patch7 -p1
+filterdiff -i 'mythtv/*' %{PATCH8} | %{__patch} -p1 -s
 
 rm -rf database/old # not supported in PLD
 
@@ -317,23 +321,23 @@ export CXX="%{__cxx}"
 %if %{with cpu_autodetect}
        --enable-proc-opt \
 %else
-    %ifarch %{ix86}
+       %ifarch %{ix86}
                %ifarch athlon
                        --arch=athlon \
                %else
                        --cpu=i386 --tune=pentium4 \
                %endif
-    %endif
-    %ifarch %{x8664}
+       %endif
+       %ifarch %{x8664}
        --arch=x86_64 \
-    %endif
+       %endif
        %{?with_mmx:--enable-mmx} \
 %endif
        %{?with_dvb:--enable-dvb --dvb-path=%{_includedir} --enable-dvb-eit} \
        --%{?with_arts:en}%{!?with_arts:dis}able-audio-arts \
        --%{?with_alsa:en}%{!?with_alsa:dis}able-audio-alsa \
        --%{?with_oss:en}%{!?with_oss:dis}able-audio-oss \
-       --%{?with_oss:en}%{!?with_oss:dis}able-audio-jack \
+       --%{?with_jack:en}%{!?with_jack:dis}able-audio-jack \
        --enable-dvd \
        --%{?with_opengl:en}%{!?with_opengl:dis}able-opengl-vsync \
        --%{?with_lirc:en}%{!?with_lirc:dis}able-lirc \
@@ -391,7 +395,7 @@ s,%%lang(pt_br),%%lang(pt_BR),
 ' *.lang
 
 rm -rf mythtvosd mythwelcome mythlcdserver
-mkdir -p mythtvosd mythwelcome
+install -d mythtvosd mythwelcome
 cp -a programs/mythtvosd/{README,*.xml} mythtvosd
 cp -a programs/mythwelcome/README mythwelcome
 cp -a programs/mythlcdserver/README mythlcdserver