- patch9 (-ffmpeg-API) disabled, as that are just some random changes from the

  devel branch (including e.g. Qt4 compatibility), incompatible with this
  version. Why was this patch added?
- s/BuildRequires/BuildConflicts/ for ffmpeg-devel, so at least building with
  the included ffmpeg works
- Release: 6.1

Changed files:
    mythtv.spec -> 1.76

diff --git a/mythtv.spec b/mythtv.spec
index 2942df902a4f5cb472164db6fe096b0f3156faa3..81b0441149558deb6d17a769a6e8935f5e6db0e3 100644 (file)
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -3,6 +3,7 @@
 # - lcd? (app-misc/lcdproc)
 # - icons for desktop entries
 # - alpha, sparc, ppc arches?
+# - make it build with ffmpeg-devel installed
 #
 # Specfile for MythTV
 #
@@ -36,7 +37,7 @@ Summary:      A personal video recorder (PVR) application
 Summary(pl.UTF-8):     Osobista aplikacja do nagrywania obrazu (PVR)
 Name:          mythtv
 Version:       0.21
-Release:       6
+Release:       6.1
 License:       GPL v2
 Group:         Applications/Multimedia
 Source0:       http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
@@ -55,13 +56,14 @@ Patch5:             %{name}-sbinpath.patch
 Patch6:                %{name}-dvdnav-shared.patch
 Patch7:                %{name}-libs.patch
 Patch8:                %{name}-fixes.patch
+# this is just some random changes from development snapshots, not compatible with this version
 Patch9:                %{name}-ffmpeg-API.patch
 URL:           http://www.mythtv.org/
 BuildRequires: OpenGL-devel
 BuildRequires: OpenGL-GLU-devel
 %{?with_alsa:BuildRequires:    alsa-lib-devel}
 %{?with_arts:BuildRequires:    arts-devel >= 13:0.9.5}
-BuildRequires: ffmpeg-devel
+BuildConflicts:        ffmpeg-devel
 BuildRequires: freetype-devel >= 1:2.0.0
 %{?with_jack:BuildRequires:    jack-audio-connection-kit-devel}
 BuildRequires: lame-libs-devel
@@ -278,7 +280,7 @@ Statyczna biblioteka libmyth.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
+#%patch9 -p1
 
 rm -rf database/old # not supported in PLD