Branch: master

fbd6735c 2016-10-08 06:53:29 François Andriot
RPM packaging: enable dvdread support in k3b, k9copy
M redhat/applications/k3b/k3b-14.0.0.spec
M redhat/applications/k9copy/k9copy-14.0.0.spec
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index 82d3a11..f1a5777 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -150,13 +150,11 @@
 %endif
 
 # DVDREAD support
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
 %define with_dvdread 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	%{_lib}dvdread-devel
 %else
 BuildRequires:	libdvdread-devel
-%endif
 %endif
 
 # FLAC support
@@ -204,7 +202,6 @@
 %endif
 
 # FFMPEG support
-%if 0%{?opensuse_bs} == 0
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define with_ffmpeg 1
 %if 0%{?mdkversion} || 0%{?mgaversion}
@@ -212,7 +209,6 @@
 %endif
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 BuildRequires:	ffmpeg-devel
-%endif
 %endif
 %endif
 
diff --git a/redhat/applications/k9copy/k9copy-14.0.0.spec b/redhat/applications/k9copy/k9copy-14.0.0.spec
index 3aff74b..261f28b 100644
--- a/redhat/applications/k9copy/k9copy-14.0.0.spec
+++ b/redhat/applications/k9copy/k9copy-14.0.0.spec
@@ -81,6 +81,13 @@
 BuildRequires:	ffmpeg-devel
 Requires:		ffmpeg
 
+# DVDREAD support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}dvdread-devel
+%else
+BuildRequires:	libdvdread-devel
+%endif
+
 
 %description
 k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9