RPM packaging: disable musicbrainz support in K3B (causes FTBFS), remove obsolete fedora patch

1 files changed, 3 insertions, 19 deletions

diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index a83b551bc..d7745ea13 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -57,11 +57,6 @@ Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source2:		k3brc
-
-# Legacy RedHat / Fedora patches
-# manual bufsize (upstream?)
-Patch4:			k3b-1.0.4-manualbufsize.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -89,12 +84,6 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	taglib-devel
 BuildRequires:	zlib-devel
 
-%if 0%{?fedora} >= 24
-BuildRequires:	libmusicbrainz5-devel
-%else
-BuildRequires:	libmusicbrainz-devel
-%endif
-
 # IDN support
 BuildRequires:	libidn-devel
 
@@ -300,7 +289,6 @@ BuildArch: noarch
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
-%{tde_confdir}/k3brc
 %{tde_datadir}/mimelnk/application/x-k3b.desktop
 %{tde_datadir}/icons/hicolor/*/apps/k3b.png
 %{tde_datadir}/services/tdefile_k3b.desktop
@@ -419,9 +407,6 @@ and a generic audio and video file converter.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# set in k3brc too 
-%patch4 -p1 -b .manualbufsize
-
 
 %build
 unset QTDIR QTINC QTLIB
@@ -429,8 +414,8 @@ export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
 # FFMPEG trick ...
-if [ -d /usr/include/ffmpeg ]; then
-	export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
+if [ -d "/usr/include/ffmpeg" ]; then
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg -I/opt/trinity/include"
 fi
 
 if ! rpm -E %%cmake|grep -q "cd build"; then
@@ -457,7 +442,7 @@ fi
   -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
   -DWITH_ALL_OPTIONS="ON" \
-  -DWITH_MUSICBRAINZ="ON" \
+  -DWITH_MUSICBRAINZ="OFF" \
   -DWITH_FFMPEG_ALL_CODECS="ON" \
   -DWITH_MUSEPACK="ON" \
   ..
@@ -469,7 +454,6 @@ fi
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
-%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{tde_confdir}/k3brc
 
 # remove the .la files
 %__rm -f %{buildroot}%{tde_libdir}/libk3b*.la